diff options
| author | Douwe Maan <douwe@selenight.nl> | 2017-05-18 15:48:42 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2017-05-18 15:48:42 -0500 |
| commit | 7a7e9288d4dea50a9797b3f624bf8174fa7060d4 (patch) | |
| tree | 673deb5b6d8047b511ff01e9d7c1110fc4f0812a /app/models/merge_request.rb | |
| parent | b46b52af37fd8c800e8fdca5de25be31415c7d5d (diff) | |
| download | gitlab-ce-7a7e9288d4dea50a9797b3f624bf8174fa7060d4.tar.gz | |
Stop MR conflict code from blowing up when branches are missingdm-no-conflicts-when-branches-are-missing
Diffstat (limited to 'app/models/merge_request.rb')
| -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 |