Skip to content

G
gitlab-ce
Commit 1c0bc48b authored by Tim Zallmann's avatar Tim Zallmann Committed by Clement Ho
Browse files
Options

Resolve "Approvers block in new MR page is broken after BS4"

parent ce902b95
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
ee/app/views/shared/issuable/_approvals.html.haml
View file @ 1c0bc48b
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
- ineligible_approver = issuable.author || current_user - ineligible_approver = issuable.author || current_user
- can_update_approvers = can?(current_user, :update_approvers, issuable) - can_update_approvers = can?(current_user, :update_approvers, issuable)
.form-group .form-group.row
= form.label :approver_ids, class: 'col-form-label' do = form.label :approver_ids, class: 'col-form-label col-sm-2' do
Approvers Approvers
.col-sm-10 .col-sm-10
- if can_update_approvers - if can_update_approvers
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
Remove Remove
.col-sm-12 .col-sm-12
.form-group .form-group.row
= form.label :approvals_before_merge, class: 'label-light' do = form.label :approvals_before_merge, class: 'label-light' do
Approvals required Approvals required
= form.number_field :approvals_before_merge, class: 'form-control', value: issuable.approvals_required, readonly: !can_update_approvers = form.number_field :approvals_before_merge, class: 'form-control', value: issuable.approvals_required, readonly: !can_update_approvers
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7