summaryrefslogtreecommitdiff
path: root/doc/user/project/merge_requests
diff options
context:
space:
mode:
authorLucas Charles <me@lucascharles.me>2019-08-02 00:10:34 +0000
committerEvan Read <eread@gitlab.com>2019-08-02 00:10:34 +0000
commit0fadca7fa99a77159b57add58af5adfe1eb3fffb (patch)
treee63e0e3bc2ef6c2b66d8949e00864d95ef92f49a /doc/user/project/merge_requests
parent4a4b863b1ad1d3dbb8590b0a83f3f397fab2106a (diff)
downloadgitlab-ce-0fadca7fa99a77159b57add58af5adfe1eb3fffb.tar.gz
Add documentation for Security Approvals for MRs
Documents how to enable security approvals
Diffstat (limited to 'doc/user/project/merge_requests')
-rw-r--r--doc/user/project/merge_requests/merge_request_approvals.md10
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/user/project/merge_requests/merge_request_approvals.md b/doc/user/project/merge_requests/merge_request_approvals.md
index 220795d6f15..656459b3b03 100644
--- a/doc/user/project/merge_requests/merge_request_approvals.md
+++ b/doc/user/project/merge_requests/merge_request_approvals.md
@@ -331,6 +331,16 @@ the dropdown) `approver` and select the user.
![Filter MRs by an approver](img/filter_approver_merge_requests.png)
+## Security approvals in merge requests **(ULTIMATE)**
+
+> Introduced in [GitLab Ultimate](https://about.gitlab.com/pricing) 12.2.
+
+Merge Request Approvals can be configured to require approval from a member
+of your security team when a vulnerability would be introduced by a merge request.
+
+For more information, see
+[Security approvals in merge requests](../../application_security/index.md#security-approvals-in-merge-requests-ultimate).
+
<!-- ## Troubleshooting
Include any troubleshooting steps that you can foresee. If you know beforehand what issues