From 8035ea9f1274dd8cf5aa1183c79b350b6506bc4d Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Tue, 13 Jun 2017 15:39:02 +0000 Subject: Port _merge_params.html.haml conflict message --- app/views/shared/issuable/form/_merge_params.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/shared/issuable/form/_merge_params.html.haml b/app/views/shared/issuable/form/_merge_params.html.haml index 271150ed318..21469001973 100644 --- a/app/views/shared/issuable/form/_merge_params.html.haml +++ b/app/views/shared/issuable/form/_merge_params.html.haml @@ -3,7 +3,7 @@ - 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 in CE to avoid conflicts. It should only exist in CE. - return unless issuable.can_remove_source_branch?(current_user) .form-group -- cgit v1.2.1 From d837e14ad9eadcd0ae4a01089546190b1fe63cd3 Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Wed, 14 Jun 2017 15:00:21 +0000 Subject: Improve conflict message in _merge_params.html.haml --- app/views/shared/issuable/form/_merge_params.html.haml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/shared/issuable/form/_merge_params.html.haml b/app/views/shared/issuable/form/_merge_params.html.haml index 21469001973..bfa91629e1e 100644 --- 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 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 -- cgit v1.2.1