diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-06-13 16:25:52 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-06-13 16:25:52 +0100 |
| commit | ce1a5f339955545e58dce76f00b1eaaa5aafe90e (patch) | |
| tree | 24db574556ff111b88d1cd5409851dc443730d72 | |
| parent | e44502f6158be36ff78bf0ecc7e3af9a570a5e44 (diff) | |
| download | gitlab-ce-backport-merge_params-conflict-message-to-ce-master.tar.gz | |
Backport merge_params.html.haml conflict commentbackport-merge_params-conflict-message-to-ce-master
| -rw-r--r-- | app/views/shared/issuable/form/_merge_params.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
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 |