summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2019-06-04 12:04:20 +0000
committerNick Thomas <nick@gitlab.com>2019-06-04 12:04:20 +0000
commit2cff1ac7ad014c74f7edc095a98d74b51599a5e5 (patch)
treef61197a5cbd53adcc9e64555382156aaf39b7ed4 /doc
parentd2ea615415311e7da1daf6b0a4e5c3a23fb2f1c2 (diff)
parenteabc7289f600882d9ecc7008c4d11c186eb8cd79 (diff)
downloadgitlab-ce-2cff1ac7ad014c74f7edc095a98d74b51599a5e5.tar.gz
Merge branch '10685-remove-feature-flag-ce' into 'master'
Remove `approval_rules` feature flag and remove obsolete approvals implementation See merge request gitlab-org/gitlab-ce!28979
Diffstat (limited to 'doc')
-rw-r--r--doc/user/project/merge_requests/merge_request_approvals.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/user/project/merge_requests/merge_request_approvals.md b/doc/user/project/merge_requests/merge_request_approvals.md
index 52b6b56af84..2e9db949890 100644
--- a/doc/user/project/merge_requests/merge_request_approvals.md
+++ b/doc/user/project/merge_requests/merge_request_approvals.md
@@ -3,7 +3,7 @@
> Introduced in [GitLab Enterprise Edition 7.12](https://about.gitlab.com/2015/06/22/gitlab-7-12-released/#merge-request-approvers-ee-only).
NOTE: **Note:**
-If you are running a self-managed instance, the new interface shown on
+Prior to 12.0, if you are running a self-managed instance, the new interface shown on
this page will not be available unless the feature flag
`approval_rules` is enabled, which can be done from the Rails console by
instance administrators.