Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
3abcab77
Commit
3abcab77
authored
Sep 21, 2015
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed MR handling when GitLab CI project is not present
parent
183892fd
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
app/models/project_services/gitlab_ci_service.rb
app/models/project_services/gitlab_ci_service.rb
+6
-2
app/views/projects/merge_requests/widget/_heading.html.haml
app/views/projects/merge_requests/widget/_heading.html.haml
+2
-1
No files found.
app/models/project_services/gitlab_ci_service.rb
View file @
3abcab77
...
@@ -46,8 +46,10 @@ class GitlabCiService < CiService
...
@@ -46,8 +46,10 @@ class GitlabCiService < CiService
end
end
ci_project
=
Ci
::
Project
.
find_by
(
gitlab_id:
project
.
id
)
ci_project
=
Ci
::
Project
.
find_by
(
gitlab_id:
project
.
id
)
if
ci_project
Ci
::
CreateCommitService
.
new
.
execute
(
ci_project
,
data
)
Ci
::
CreateCommitService
.
new
.
execute
(
ci_project
,
data
)
end
end
end
def
get_ci_commit
(
sha
,
ref
)
def
get_ci_commit
(
sha
,
ref
)
Ci
::
Project
.
find
(
project
.
gitlab_ci_project
).
commits
.
find_by_sha_and_ref!
(
sha
,
ref
)
Ci
::
Project
.
find
(
project
.
gitlab_ci_project
).
commits
.
find_by_sha_and_ref!
(
sha
,
ref
)
...
@@ -85,8 +87,10 @@ class GitlabCiService < CiService
...
@@ -85,8 +87,10 @@ class GitlabCiService < CiService
end
end
def
build_page
(
sha
,
ref
)
def
build_page
(
sha
,
ref
)
if
project
.
gitlab_ci_project
.
present?
Ci
::
RoutesHelper
.
ci_project_ref_commits_path
(
project
.
gitlab_ci_project
,
ref
,
sha
)
Ci
::
RoutesHelper
.
ci_project_ref_commits_path
(
project
.
gitlab_ci_project
,
ref
,
sha
)
end
end
end
def
title
def
title
'GitLab CI'
'GitLab CI'
...
...
app/views/projects/merge_requests/widget/_heading.html.haml
View file @
3abcab77
...
@@ -10,6 +10,7 @@
...
@@ -10,6 +10,7 @@
%span
CI build
#{
status
}
%span
CI build
#{
status
}
for
#{
@merge_request
.
last_commit_short_sha
}
.
for
#{
@merge_request
.
last_commit_short_sha
}
.
%span
.ci-coverage
%span
.ci-coverage
-
if
ci_build_details_path
(
@merge_request
)
=
link_to
"View build details"
,
ci_build_details_path
(
@merge_request
),
:"data-no-turbolink"
=>
"data-no-turbolink"
=
link_to
"View build details"
,
ci_build_details_path
(
@merge_request
),
:"data-no-turbolink"
=>
"data-no-turbolink"
.ci_widget
.ci_widget
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment