-
Eric Eastwood authored
See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14272 Conflicts: ee/app/views/projects/ee/_merge_request_settings.html.haml
8492e06f
See https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/14272 Conflicts: ee/app/views/projects/ee/_merge_request_settings.html.haml