From 23b41af6f96b5c1ce89c04d96a29fa7f8092f08f Mon Sep 17 00:00:00 2001 From: Annabel Gray Date: Mon, 11 Jun 2018 19:58:53 +0000 Subject: Merge branch 'jivl-fix-merge-request-contribution-aligment' into 'master' Fix contribution section aligment Closes #47606 See merge request gitlab-org/gitlab-ce!19592 --- app/views/shared/issuable/form/_contribution.html.haml | 6 +++--- 1 file 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.') -- cgit v1.2.1