diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-15 08:41:17 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-15 08:41:17 +0000 |
| commit | 00b2516fbf2779c90e3b8654705b232b87bf0cfc (patch) | |
| tree | 4f4e6ac40dc9eed6baa12f46ca393dbe8fb69b38 | |
| parent | 23557433b16e03beb3e8bb94b6fc26164de639d0 (diff) | |
| parent | d837e14ad9eadcd0ae4a01089546190b1fe63cd3 (diff) | |
| download | gitlab-ce-00b2516fbf2779c90e3b8654705b232b87bf0cfc.tar.gz | |
Merge branch 'patch-23' into '9-2-stable'
Port _merge_params.html.haml conflict message
See merge request !12140
| -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 271150ed318..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, to avoid conflicts with EE. +-# 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 |