diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-06-13 15:39:02 +0000 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-06-13 15:39:02 +0000 |
| commit | 8035ea9f1274dd8cf5aa1183c79b350b6506bc4d (patch) | |
| tree | 1b5d30134acd0c12e3cd08985fd8d9b5d1b49480 /app | |
| parent | 23557433b16e03beb3e8bb94b6fc26164de639d0 (diff) | |
| download | gitlab-ce-8035ea9f1274dd8cf5aa1183c79b350b6506bc4d.tar.gz | |
Port _merge_params.html.haml conflict messagepatch-23
Diffstat (limited to 'app')
| -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 |