diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-06-14 15:00:21 +0000 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-06-14 15:00:21 +0000 |
| commit | d837e14ad9eadcd0ae4a01089546190b1fe63cd3 (patch) | |
| tree | 4f4e6ac40dc9eed6baa12f46ca393dbe8fb69b38 | |
| parent | 8035ea9f1274dd8cf5aa1183c79b350b6506bc4d (diff) | |
| download | gitlab-ce-d837e14ad9eadcd0ae4a01089546190b1fe63cd3.tar.gz | |
Improve conflict message in _merge_params.html.haml
| -rw-r--r-- | app/views/shared/issuable/form/_merge_params.html.haml | 3 |
1 files changed, 2 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 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 |