diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-18 15:02:46 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2018-04-18 15:02:46 -0500 |
| commit | 1f9c83affdea6c987b6d13f92e0e11b6e57f0d3f (patch) | |
| tree | b3d45d620bb29b5b2951432a2fabc1a5c914c86f | |
| parent | a88660244bf72c3fd32db0d91f960f4645ee9af8 (diff) | |
| download | gitlab-ce-1f9c83affdea6c987b6d13f92e0e11b6e57f0d3f.tar.gz | |
Fix alignment for Remove source branch checkbox
| -rw-r--r-- | app/views/shared/issuable/form/_merge_params.html.haml | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/app/views/shared/issuable/form/_merge_params.html.haml b/app/views/shared/issuable/form/_merge_params.html.haml index f0c2b89cef7..3c9be824ac4 100644 --- a/app/views/shared/issuable/form/_merge_params.html.haml +++ b/app/views/shared/issuable/form/_merge_params.html.haml @@ -7,11 +7,10 @@ -# This comment and the following line should only exist in CE. - return unless issuable.can_remove_source_branch?(current_user) -.form-group +.form-group.row .col-sm-10.offset-sm-2 - if issuable.can_remove_source_branch?(current_user) - .form-check - = 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. + = 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. |