diff options
| author | Nick Thomas <nick@gitlab.com> | 2016-10-19 17:48:30 +0100 |
|---|---|---|
| committer | blackst0ne <blackst0ne.ru@gmail.com> | 2016-10-21 08:43:34 +1100 |
| commit | f118d2fc7394cbbd71a8c97e0c186581c045fb47 (patch) | |
| tree | 9886f934628d2e9a9c236eb5c85271cebac66a0f /app | |
| parent | f00ee5c2ed9a0812b6337e52814756c560c879c8 (diff) | |
| download | gitlab-ce-f118d2fc7394cbbd71a8c97e0c186581c045fb47.tar.gz | |
Fix two CI endpoints for MRs where the source project is deleted
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/projects/merge_requests_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/projects/merge_requests_controller.rb b/app/controllers/projects/merge_requests_controller.rb index 55ea31e48a0..2ee53f7ceda 100644 --- a/app/controllers/projects/merge_requests_controller.rb +++ b/app/controllers/projects/merge_requests_controller.rb @@ -398,7 +398,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController status ||= "preparing" 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 if ci_service.respond_to?(:commit_coverage) |