diff options
| author | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-11 19:58:53 +0000 |
|---|---|---|
| committer | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-11 19:58:53 +0000 |
| commit | 6d0bd187da683e50a4598ce470aac2521614bb04 (patch) | |
| tree | 746eb04c9b3ea014d0208f72e1ceb3204b230f79 | |
| parent | 33f27a0f53585f5184c5bf3072dabadbbe47ca31 (diff) | |
| parent | e67d9d4534deffd4a4498440388e75c34fb9e8c9 (diff) | |
| download | gitlab-ce-6d0bd187da683e50a4598ce470aac2521614bb04.tar.gz | |
Merge branch 'jivl-fix-merge-request-contribution-aligment' into 'master'
Fix contribution section aligment
Closes #47606
See merge request gitlab-org/gitlab-ce!19592
| -rw-r--r-- | app/views/shared/issuable/form/_contribution.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/shared/issuable/form/_contribution.html.haml b/app/views/shared/issuable/form/_contribution.html.haml index 519b5fae846..bc9a1edc39c 100644 --- a/app/views/shared/issuable/form/_contribution.html.haml +++ b/app/views/shared/issuable/form/_contribution.html.haml @@ -7,11 +7,11 @@ %hr -.form-group - .col-form-label +.form-group.row + %label.col-form-label.col-sm-2 = _('Contribution') .col-sm-10 - .form-check + .form-check.prepend-top-5 = form.check_box :allow_collaboration, disabled: !issuable.can_allow_collaboration?(current_user), class: 'form-check-input' = form.label :allow_collaboration, class: 'form-check-label' do = _('Allow commits from members who can merge to the target branch.') |