Improve conflict message in _merge_params.html.haml

9acae6ef · Luke "Jared" Bennett · 63971fff · 9acae6ef
Commit 9acae6ef authored Jun 14, 2017 by Luke "Jared" Bennett
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/app/views/shared/issuable/form/_merge_params.html.haml
+++ b/app/views/shared/issuable/form/_merge_params.html.haml
@@ -3,9 +3,6 @@
 - 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.
- return unless issuable.can_remove_source_branch?(current_user)
-
 - if issuable.can_remove_source_branch?(current_user)
  .form-group
    .col-sm-10.col-sm-offset-2