diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2018-05-25 18:55:36 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2018-06-01 13:34:23 +0800 |
| commit | 5881d0a724bbb25fee68240b3a7e0f75f463970a (patch) | |
| tree | f9825997f9bad84ade6cd4ea9e913134bf654c56 | |
| parent | edbd26018083d714fad4196727a862596e71709b (diff) | |
| download | gitlab-ce-5881d0a724bbb25fee68240b3a7e0f75f463970a.tar.gz | |
Unify app/views/shared/issuable/form/_merge_params.html.haml
| -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 |