diff options
author | Robert Speicher <robert@gitlab.com> | 2017-05-19 01:13:20 +0300 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2017-05-19 01:13:20 +0300 |
commit | bcc504d3c3ed0436935ca076d6be5db5ca10a664 (patch) | |
tree | 88abcddab66bde62a1177548c2f785dddf42282c /app/models | |
parent | e5cc8e0aa81c3012eff5303543b11931158478cf (diff) | |
parent | 7a7e9288d4dea50a9797b3f624bf8174fa7060d4 (diff) |
Merge branch 'dm-no-conflicts-when-branches-are-missing' into 'master'
Stop MR conflict code from blowing up when branches are missing
Closes #32544
See merge request !11501
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/merge_request.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/merge_request.rb b/app/models/merge_request.rb index d7e7ae7a25f..9be00880438 100644 --- a/app/models/merge_request.rb +++ b/app/models/merge_request.rb @@ -293,6 +293,8 @@ class MergeRequest < ActiveRecord::Base attr_writer :target_branch_sha, :source_branch_sha def source_branch_head + return unless source_project + source_branch_ref = @source_branch_sha || source_branch source_project.repository.commit(source_branch_ref) if source_branch_ref end |