BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
f118d2fc
Commit
f118d2fc
authored
Oct 19, 2016
by
Nick Thomas
Committed by
blackst0ne
Oct 21, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix two CI endpoints for MRs where the source project is deleted
parent
f00ee5c2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+1
-1
No files found.
app/controllers/projects/merge_requests_controller.rb
View file @
f118d2fc
...
@@ -398,7 +398,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
...
@@ -398,7 +398,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
status
||=
"preparing"
status
||=
"preparing"
else
else
ci_service
=
@merge_request
.
source_project
.
ci_service
ci_service
=
@merge_request
.
source_project
.
try
(
:ci_service
)
status
=
ci_service
.
commit_status
(
merge_request
.
diff_head_sha
,
merge_request
.
source_branch
)
if
ci_service
status
=
ci_service
.
commit_status
(
merge_request
.
diff_head_sha
,
merge_request
.
source_branch
)
if
ci_service
if
ci_service
.
respond_to?
(
:commit_coverage
)
if
ci_service
.
respond_to?
(
:commit_coverage
)
...
...
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