Correctly determine MR diff base when MR has merge conflicts (!2632) · Merge requests · GitLab.org / GitLab FOSS · GitLab

Do not update/delete: Banner broadcast message test data

Do not update/delete: Notification broadcast message test data

Douwe Maan requested to merge mr-merge-base into master Jan 27, 2016

Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/12779