diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-21 09:40:03 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-11-21 09:40:03 +0000 |
| commit | 0e0c90843f3eb8e97f0c28a48b513324274a4bd5 (patch) | |
| tree | ca6351619180df59e7ea72eff81640bf4c9b9bdf /app/models/merge_request.rb | |
| parent | e920414e6cbb3950456892b3ab7c9d9d7b0d056f (diff) | |
| parent | d496a6b919abd32252f54e59d5607956005cfb15 (diff) | |
| download | gitlab-ce-0e0c90843f3eb8e97f0c28a48b513324274a4bd5.tar.gz | |
Merge branch 'fix-merge-requests-without-source-projects' into 'master'
Handle removed source projects in MR CI commits
Fixes #3599
@dzaporozhets assigning this to you since you wrote the original code. Perhaps checking for the source project isn't the right way, but I'm not sure if there's a better way (e.g. somewhere earlier in the process) that we can detect this.
See merge request !1859
Diffstat (limited to 'app/models/merge_request.rb')
| -rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index 1e8d9908f0a..1b3d6079d2c 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -476,7 +476,7 @@ class MergeRequest < ActiveRecord::Base end def ci_commit - if last_commit + if last_commit and source_project source_project.ci_commit(last_commit.id) end end |