BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Commit 00b2516f by Sean McGivern
Options

Merge branch 'patch-23' into '9-2-stable'

Port _merge_params.html.haml conflict message See merge request !12140
parents 23557433 d837e14a
Showing with 2 additions and 1 deletion
app/views/shared/issuable/form/_merge_params.html.haml
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
- return unless issuable.is_a?(MergeRequest) - return unless issuable.is_a?(MergeRequest)
- return if issuable.closed_without_fork? - 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) - return unless issuable.can_remove_source_branch?(current_user)
.form-group .form-group
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment