diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-06-13 18:25:52 +0300 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-06-14 16:57:16 +0300 |
| commit | 8c602a379171be47e17d31ec451f8aa46bc572c8 (patch) | |
| tree | e1cb271b682e5e767e73abe28b8cda0c0272e5e1 /app/views | |
| parent | 64e85fdaffcd03ef52ff74953b1a4e0caf5a23e8 (diff) | |
Backport merge_params.html.haml conflict comment
Diffstat (limited to 'app/views')
| -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 |