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
114465c3
Commit
114465c3
authored
Jul 17, 2015
by
Job van der Voort
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
new documentation on merge request approvals
parent
76c57aa5
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
67 additions
and
19 deletions
+67
-19
doc/workflow/README.md
doc/workflow/README.md
+1
-1
doc/workflow/approval_for_merge_requests.md
doc/workflow/approval_for_merge_requests.md
+0
-18
doc/workflow/approval_for_merge_requests/mr.png
doc/workflow/approval_for_merge_requests/mr.png
+0
-0
doc/workflow/approval_for_merge_requests/settings.png
doc/workflow/approval_for_merge_requests/settings.png
+0
-0
doc/workflow/merge_request_approvals.md
doc/workflow/merge_request_approvals.md
+66
-0
doc/workflow/merge_request_approvals/1_named_approval.png
doc/workflow/merge_request_approvals/1_named_approval.png
+0
-0
doc/workflow/merge_request_approvals/2_approvals.png
doc/workflow/merge_request_approvals/2_approvals.png
+0
-0
doc/workflow/merge_request_approvals/2_named_approvals.png
doc/workflow/merge_request_approvals/2_named_approvals.png
+0
-0
doc/workflow/merge_request_approvals/approvals_mr.png
doc/workflow/merge_request_approvals/approvals_mr.png
+0
-0
doc/workflow/merge_request_approvals/approvals_settings.png
doc/workflow/merge_request_approvals/approvals_settings.png
+0
-0
No files found.
doc/workflow/README.md
View file @
114465c3
# Workflow
-
[
Approval for merge requests
](
approval_for_merge_requests.md
)
-
[
Authorization for merge requests
](
authorization_for_merge_requests.md
)
-
[
Change your time zone
](
timezone.md
)
-
[
Feature branch workflow
](
workflow.md
)
...
...
@@ -10,6 +9,7 @@
-
[
Keyboard shortcuts
](
shortcuts.md
)
-
[
Labels
](
labels.md
)
-
[
Manage large binaries with git annex
](
git_annex.md
)
-
[
Merge Request Approvals
](
merge_request_approvals.md
)
-
[
Notifications
](
notifications.md
)
-
[
Project Features
](
project_features.md
)
-
[
Project forking workflow
](
forking_workflow.md
)
...
...
doc/workflow/approval_for_merge_requests.md
deleted
100644 → 0
View file @
76c57aa5
# Approval for merge requests
Usually you accept merge request if it is ready and reviewed. But in certain
cases you want to be sure that every merge request will be reviewed by several
people before it gets merged. You can use GitLab approve feature for enforcing such
workflow. To enable it you should go to project settings page and set
"Approvals required" field to numeric value. For example if you set it to number 3
that means each merge request should receive 3 approves from different people
before it can be merged via user interface.
![
approve_setting
](
approval_for_merge_requests/settings.png
)
After you set approves value you can see on merge request page "Approve" button
instead of "Accept" one. As soon as merge request get enough approvals it will
be available for merge with user interface.
![
approve_merge_request
](
approval_for_merge_requests/mr.png
)
doc/workflow/approval_for_merge_requests/mr.png
deleted
100644 → 0
View file @
76c57aa5
165 KB
doc/workflow/approval_for_merge_requests/settings.png
deleted
100644 → 0
View file @
76c57aa5
144 KB
doc/workflow/merge_request_approvals.md
0 → 100644
View file @
114465c3
# Merge Request Approvals
If you want to make sure every merge request is approved by one or more
people, you can enforce this workflow by using merge request approvals.
Merge request approvals allow you to set the number of necessary approvals
and predefine a list of approvers that will need to approve every
merge request in a project.
![
Merge request approval
](
merge_request_approvals/2_approvals.png
)
## Configuring Approvals
You can configure the approvals in the project settings, under merge requests.
![
Merge Request Approvals in Project Settings
](
merge_request_approvals/approvals_settings.png
)
To enable it, set
**Approvals required**
to 1 or higher.
### Approvals Required
This sets the amount of approvals required before being able to merge a merge request.
At 0, this disables the feature. Any value above requires that amount of different
users to approve the merge request.
### Reset approvals on push
With this setting turned on, any done approvals are reset when new a new push
is done to the merge request branch.
Turn "Reset approvals on push" off if you want approvals to persist,
independent of changes to the merge request.
### Approvers
At approvers you can define the default set of users that need to approve a
merge request.
If there are more approvers than required approvals, any subset of these users
can approve the merge request.
If there are less approvers than required approvals, all the set approvers plus
any other user(s) need to approve the merge request before being able to merge it.
![
One specific user and someone else need to approve this merge request
](
merge_request_approvals/1_named_approval.png
)
If the approvers are equal to the amount of required approvals, all the approvers are
required to approve merge requests.
![
Two specific users need to approve this merge request
](
merge_request_approvals/2_named_approvals.png
)
Note that approvers can be changed during merge request creation.
## Using Approvals
After configuring Approvals, you will see the following during merge request creation.
![
Choosing approvers in merge request creation
](
merge_request_approvals/approvals_mr.png
)
You can change the default set of approvers before creating the merge request.
You can't change the amount of required approvals. This ensures that you're
not forced to adjust settings when someone is unavailable for approval, yet
the process is still enforced.
To approve a merge request, simply press the button.
![
Merge request approval
](
merge_request_approvals/2_approvals.png
)
doc/workflow/merge_request_approvals/1_named_approval.png
0 → 100644
View file @
114465c3
34.4 KB
doc/workflow/merge_request_approvals/2_approvals.png
0 → 100644
View file @
114465c3
30.8 KB
doc/workflow/merge_request_approvals/2_named_approvals.png
0 → 100644
View file @
114465c3
46.4 KB
doc/workflow/merge_request_approvals/approvals_mr.png
0 → 100644
View file @
114465c3
35.7 KB
doc/workflow/merge_request_approvals/approvals_settings.png
0 → 100644
View file @
114465c3
56.6 KB
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