Stop MR conflict code from blowing up when branches are missing (9.2)
Compare changes
Files
3+ 3
− 0
@@ -299,6 +299,8 @@ class MergeRequest < ActiveRecord::Base
@@ -919,6 +921,7 @@ class MergeRequest < ActiveRecord::Base
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Port of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11501 for 9-2-stable
.
/cc @timothyandrew