Commit 2622b470 authored by Luke "Jared" Bennett's avatar Luke "Jared" Bennett

Improve conflict message in _merge_params.html.haml

parent 8c602a37
......@@ -3,7 +3,8 @@
- return unless issuable.is_a?(MergeRequest)
- return if issuable.closed_without_fork?
-# This check is duplicated below in CE to avoid conflicts. It should only exist in CE.
-# This check is duplicated below to avoid CE -> EE merge conflicts.
-# This comment and the following line should only exist in CE.
- return unless issuable.can_remove_source_branch?(current_user)
.form-group
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment