Skip to content
Snippets Groups Projects

Stop MR conflict code from blowing up when branches are missing

Merged Douwe Maan requested to merge dm-no-conflicts-when-branches-are-missing into master
Files
4
@@ -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
Loading