diff options
| author | Fatih Acet <acetfatih@gmail.com> | 2017-05-09 04:15:34 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2017-05-09 04:15:34 +0000 |
| commit | 0151325dacebb99d54b6effb1d5842c0c712168c (patch) | |
| tree | 767ea3c8cfeedab5a0ce1921d5842b149ea7c0be /app/views/shared/issuable | |
| parent | 9ada13d343a4736275d2c026ee980abe5c5e5763 (diff) | |
| download | gitlab-ce-0151325dacebb99d54b6effb1d5842c0c712168c.tar.gz | |
Merge request widget redesign
Diffstat (limited to 'app/views/shared/issuable')
| -rw-r--r-- | app/views/shared/issuable/form/_merge_params.html.haml | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/app/views/shared/issuable/form/_merge_params.html.haml b/app/views/shared/issuable/form/_merge_params.html.haml index 03309722326..d23f79be2be 100644 --- a/app/views/shared/issuable/form/_merge_params.html.haml +++ b/app/views/shared/issuable/form/_merge_params.html.haml @@ -5,12 +5,3 @@ -# This check is duplicated below, to avoid conflicts with EE. - return unless issuable.can_remove_source_branch?(current_user) - -.form-group - .col-sm-10.col-sm-offset-2 - - if issuable.can_remove_source_branch?(current_user) - .checkbox - = label_tag 'merge_request[force_remove_source_branch]' do - = hidden_field_tag 'merge_request[force_remove_source_branch]', '0', id: nil - = check_box_tag 'merge_request[force_remove_source_branch]', '1', issuable.force_remove_source_branch? - Remove source branch when merge request is accepted. |