Stop MR conflict code from blowing up when branches are missing (9.2) (!11502) · Merge requests · GitLab.org / GitLab FOSS · GitLab

Snippets Groups Projects

Do not update/delete: Banner broadcast message test data

Do not update/delete: Notification broadcast message test data

Merged Douwe Maan requested to merge dm-no-conflicts-when-branches-are-missing-9-2 into 9-2-stable 7 years ago

Port of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/11501 for 9-2-stable.

/cc @timothyandrew

Edited 7 years ago by Robert Speicher

Activity

Douwe Maan added 1 commit 7 years ago
added 1 commit

5a762403 - Stop MR conflict code from blowing up when branches are missing

Compare with previous version
Robert Speicher changed the description 7 years ago

changed the description
Douwe Maan added 1 commit 7 years ago
added 1 commit

b8ca5c78 - Stop MR conflict code from blowing up when branches are missing

Compare with previous version
Douwe Maan assigned to @selfup 7 years ago

assigned to @selfup
Douwe Maan added regression label 7 years ago

added regression label
username-removed-642931 mentioned in issue #31934 (closed) 7 years ago

mentioned in issue #31934 (closed)
username-removed-642931 approved this merge request 7 years ago

approved this merge request
username-removed-642931 mentioned in commit e2d7eb88 7 years ago

mentioned in commit e2d7eb88
username-removed-642931 merged 7 years ago

merged
username-removed-642931 @selfup · 7 years ago

Contributor

Merged into 9-2-stable-ee will go into 9-2 RC6

Please register or sign in to reply