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
47acc817
Commit
47acc817
authored
Jul 04, 2017
by
Simon Knox
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
link to docs from settings page
other minor review feedback
parent
ebcf0558
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
app/models/ee/project.rb
app/models/ee/project.rb
+1
-1
app/views/projects/ee/_merge_request_settings.html.haml
app/views/projects/ee/_merge_request_settings.html.haml
+1
-0
doc/user/project/merge_requests/merge_request_approvals.md
doc/user/project/merge_requests/merge_request_approvals.md
+2
-2
No files found.
app/models/ee/project.rb
View file @
47acc817
...
@@ -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?
...
...
app/views/projects/ee/_merge_request_settings.html.haml
View file @
47acc817
...
@@ -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
...
...
doc/user/project/merge_requests/merge_request_approvals.md
View file @
47acc817
...
@@ -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
chang
e the number of required approvers.
and
increas
e the number of required approvers.
### Reset approvals on push
### Reset approvals on push
...
...
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