diff options
| author | Nick Thomas <nick@gitlab.com> | 2016-10-19 17:48:30 +0100 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2016-10-20 12:24:27 +0100 |
| commit | 6f846fcbe8fa129e240ae58c8d4bbb1e1a82bbef (patch) | |
| tree | f523d732c5f873b6d639a363486760138a3cc7f8 /app/controllers | |
| parent | 374071321d0cfb7a161ec38e85e27e1d46ae7c9a (diff) | |
| download | gitlab-ce-6f846fcbe8fa129e240ae58c8d4bbb1e1a82bbef.tar.gz | |
Fix two CI endpoints for MRs where the source project is deleted
Diffstat (limited to 'app/controllers')
| -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) |