diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2018-05-25 18:55:36 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2018-05-31 17:03:58 +0800 |
| commit | e2cc4aefda9045fa33dce262958a8e8dad1e63e8 (patch) | |
| tree | 4387dbd71348b35130b96cc14fe488093c278258 | |
| parent | fcae8cd922e6d4710f65035aeb65e5f84586dc96 (diff) | |
| download | gitlab-ce-ce-6145-extract-app-views-shared-issuable.tar.gz | |
Unify app/views/shared/issuable/form/_merge_params.html.hamlce-6145-extract-app-views-shared-issuable
| -rw-r--r-- | app/views/shared/issuable/form/_merge_params.html.haml | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/app/views/shared/issuable/form/_merge_params.html.haml b/app/views/shared/issuable/form/_merge_params.html.haml index 90fbf19e843..7278e6317f2 100644 --- 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 |