Unify app/views/shared/issuable/form/_merge_params.html.haml

5881d0a7 · Lin Jen-Shin · edbd2601 · 5881d0a7
Commit 5881d0a7 authored May 25, 2018 by Lin Jen-Shin
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 7 deletions

app/views/shared/issuable/form/_merge_params.html.haml app/views/shared/issuable/form/_merge_params.html.haml +3 -7

No files found.
--- a/app/views/shared/issuable/form/_merge_params.html.haml
+++ b/app/views/shared/issuable/form/_merge_params.html.haml
@@ -3,13 +3,9 @@
 - return unless issuable.is_a?(MergeRequest)
 - return if issuable.closed_without_fork?

-# 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.row
-  .col-sm-10.offset-sm-2
-    - if issuable.can_remove_source_branch?(current_user)
+- if issuable.can_remove_source_branch?(current_user)
+  .form-group.row
+    .col-sm-10.offset-sm-2
      .form-check
        = label_tag 'merge_request[force_remove_source_branch]' do
          = hidden_field_tag 'merge_request[force_remove_source_branch]', '0', id: nil