From ce1a5f339955545e58dce76f00b1eaaa5aafe90e Mon Sep 17 00:00:00 2001 From: "Luke \"Jared\" Bennett" Date: Tue, 13 Jun 2017 16:25:52 +0100 Subject: Backport merge_params.html.haml conflict comment --- 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