Commit 47acc817 authored by Simon Knox's avatar Simon Knox

link to docs from settings page

other minor review feedback
parent ebcf0558
...@@ -140,7 +140,7 @@ module EE ...@@ -140,7 +140,7 @@ module EE
end end
def can_override_approvers? def can_override_approvers?
!disable_overriding_approvers_per_merge_request !disable_overriding_approvers_per_merge_request?
end end
def shared_runners_available? def shared_runners_available?
......
...@@ -113,6 +113,7 @@ ...@@ -113,6 +113,7 @@
= form.label :disable_overriding_approvers_per_merge_request do = form.label :disable_overriding_approvers_per_merge_request do
= form.check_box(:disable_overriding_approvers_per_merge_request, { checked: can_override_approvers }, false, true) = form.check_box(:disable_overriding_approvers_per_merge_request, { checked: can_override_approvers }, false, true)
%strong Can overwrite approvers and approvals required per merge request %strong Can overwrite approvers and approvals required per merge request
= link_to icon('question-circle'), help_page_path("user/project/merge_requests/merge_request_approvals", anchor: 'can-overwrite-approvers-and-approvals-required-per-merge-request'), target: '_blank'
.form-group.reset-approvals-on-push .form-group.reset-approvals-on-push
.checkbox .checkbox
......
...@@ -24,11 +24,11 @@ The number of approvers can be higher than the required approvals. ...@@ -24,11 +24,11 @@ The number of approvers can be higher than the required approvals.
### Can overwrite approvers and approvals required per merge request ### Can overwrite approvers and approvals required per merge request
> [Introduced][https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/2016] in GitLab Enterprise Edition 9.4. > Introduced in GitLab Enterprise Edition 9.4.
When this setting is enabled, the approvers for a project can be overridden for When this setting is enabled, the approvers for a project can be overridden for
a merge request. When editing a merge request you can add or remove approvers, a merge request. When editing a merge request you can add or remove approvers,
and change the number of required approvers. and increase the number of required approvers.
### Reset approvals on push ### Reset approvals on push
......
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