Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
7858ef44
Commit
7858ef44
authored
Jul 04, 2017
by
Simon Knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use 'override' everywhere instead of 'overwrite'
parent
47acc817
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
app/views/projects/ee/_merge_request_settings.html.haml
app/views/projects/ee/_merge_request_settings.html.haml
+3
-3
changelogs/unreleased-ee/582-toggle-override.yml
changelogs/unreleased-ee/582-toggle-override.yml
+0
-0
doc/user/project/merge_requests/merge_request_approvals.md
doc/user/project/merge_requests/merge_request_approvals.md
+1
-1
No files found.
app/views/projects/ee/_merge_request_settings.html.haml
View file @
7858ef44
...
...
@@ -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 over
writ
e approvers and approvals required per merge request
=
link_to
icon
(
'question-circle'
),
help_page_path
(
"user/project/merge_requests/merge_request_approvals"
,
anchor:
'can-over
writ
e-approvers-and-approvals-required-per-merge-request'
),
target:
'_blank'
%strong
Can over
rid
e approvers and approvals required per merge request
=
link_to
icon
(
'question-circle'
),
help_page_path
(
"user/project/merge_requests/merge_request_approvals"
,
anchor:
'can-over
rid
e-approvers-and-approvals-required-per-merge-request'
),
target:
'_blank'
.form-group.reset-approvals-on-push
.checkbox
...
...
changelogs/unreleased-ee/582-toggle-over
writ
e.yml
→
changelogs/unreleased-ee/582-toggle-over
rid
e.yml
View file @
7858ef44
File moved
doc/user/project/merge_requests/merge_request_approvals.md
View file @
7858ef44
...
...
@@ -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 over
writ
e approvers and approvals required per merge request
### Can over
rid
e approvers and approvals required per merge request
> Introduced in GitLab Enterprise Edition 9.4.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment