Commit 7858ef44 authored by Simon Knox's avatar Simon Knox

use 'override' everywhere instead of 'overwrite'

parent 47acc817
......@@ -108,12 +108,12 @@
.help-block
Set number of approvers required before open merge requests can be merged
.form-group.mr-overwrite-approvals
.form-group
.checkbox
= form.label :disable_overriding_approvers_per_merge_request do
= 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
= 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'
%strong Can override approvers and approvals required per merge request
= link_to icon('question-circle'), help_page_path("user/project/merge_requests/merge_request_approvals", anchor: 'can-override-approvers-and-approvals-required-per-merge-request'), target: '_blank'
.form-group.reset-approvals-on-push
.checkbox
......
......@@ -22,7 +22,7 @@ This sets the amount of approvals required before being able to merge a merge re
The number of approvers can be higher than the required approvals.
### Can overwrite approvers and approvals required per merge request
### Can override approvers and approvals required per merge request
> Introduced in GitLab Enterprise Edition 9.4.
......
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