diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-15 08:41:20 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2017-06-15 08:41:20 +0000 |
| commit | e51816ff8ebece4b60d004daebc8cd8d3dca3b09 (patch) | |
| tree | 829141a3d6939972edca64bc66386422cfc22083 | |
| parent | 44e5f57b1ea0e43cb27c9ac080839949ab8485d1 (diff) | |
| parent | 2622b470bd95ce09f7dbf89268aac87d13205ca6 (diff) | |
| download | gitlab-ce-e51816ff8ebece4b60d004daebc8cd8d3dca3b09.tar.gz | |
Merge branch 'backport-merge_params-conflict-message-to-ce-master' into 'master'
Backport merge_params.html.haml conflict comment
See merge request !12138
| -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 |