diff options
| author | Annabel Gray <annabel.m.gray@gmail.com> | 2018-06-11 19:58:53 +0000 |
|---|---|---|
| committer | Alessio Caiazza <acaiazza@gitlab.com> | 2018-06-12 11:38:23 +0200 |
| commit | 23b41af6f96b5c1ce89c04d96a29fa7f8092f08f (patch) | |
| tree | f595f23303a43054980fb1c5f4865e0e91cf7f6b | |
| parent | e3d6d3bf76d905f2d06a28324ce19d751ee5e8a4 (diff) | |
| download | gitlab-ce-23b41af6f96b5c1ce89c04d96a29fa7f8092f08f.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.') |