Merge branch 'patch-23' into '9-2-stable'

Port _merge_params.html.haml conflict message See merge request !12140

Merge branch 'patch-23' into '9-2-stable'
00b2516f · Sean McGivern · 23557433 · d837e14a · 00b2516f
Commit 00b2516f authored Jun 15, 2017 by Sean McGivern
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

_merge_params.html.haml app/views/shared/issuable/form/_merge_params.html.haml +2 -1

No files found.
--- a/app/views/shared/issuable/form/_merge_params.html.haml
+++ b/app/views/shared/issuable/form/_merge_params.html.haml
@@ -3,7 +3,8 @@
 - return unless issuable.is_a?(MergeRequest)
 - return if issuable.closed_without_fork?

-# This check is duplicated below, to avoid conflicts with EE.
+-# 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