summaryrefslogtreecommitdiff
path: root/doc/user/admin_area/settings
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-10 12:07:47 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-10 12:07:47 +0000
commit96b0c1245c93585a8b0fe23e22306d32ff4e4905 (patch)
treed2904751e1a2529e8239381ce747339cdbf5116c /doc/user/admin_area/settings
parent0ba3a054d2190094ffda1ebe3aa53ffc5b92247d (diff)
downloadgitlab-ce-96b0c1245c93585a8b0fe23e22306d32ff4e4905.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user/admin_area/settings')
-rw-r--r--doc/user/admin_area/settings/continuous_integration.md7
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/user/admin_area/settings/continuous_integration.md b/doc/user/admin_area/settings/continuous_integration.md
index 8f8af0d7481..43b0671d9e0 100644
--- a/doc/user/admin_area/settings/continuous_integration.md
+++ b/doc/user/admin_area/settings/continuous_integration.md
@@ -169,9 +169,10 @@ but commented out to help encourage others to add to it in the future. -->
## Required pipeline configuration **(PREMIUM ONLY)**
CAUTION: **Caution:**
-The Required Pipeline Configuration feature is deprecated and will be removed when an
-[improved compliance solution](https://gitlab.com/gitlab-org/gitlab/issues/34830)
-is added to GitLab. It is recommended to avoid using this feature.
+This feature is being re-evaluated in favor of a different
+[compliance solution](https://gitlab.com/gitlab-org/gitlab/issues/34830).
+We recommend that users who haven't yet implemented this feature wait for
+the new solution.
GitLab administrators can force a pipeline configuration to run on every
pipeline.