summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-25 09:12:58 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-25 09:12:58 +0000
commitdbd50b6e203994cdb393494faa8fc1b2fb406487 (patch)
tree0627b8469d5ccbd5a5b306b2bf8b6de0bc4aecb9 /doc
parent8a1c3b6e1ad7d80b5e8a5ddab26cffd9b8b06c66 (diff)
downloadgitlab-ce-dbd50b6e203994cdb393494faa8fc1b2fb406487.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
-rw-r--r--doc/user/admin_area/settings/continuous_integration.md5
-rw-r--r--doc/user/clusters/applications.md12
2 files changed, 17 insertions, 0 deletions
diff --git a/doc/user/admin_area/settings/continuous_integration.md b/doc/user/admin_area/settings/continuous_integration.md
index f775dd8bbb4..79deda73d34 100644
--- a/doc/user/admin_area/settings/continuous_integration.md
+++ b/doc/user/admin_area/settings/continuous_integration.md
@@ -161,6 +161,11 @@ 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.
+
GitLab administrators can force a pipeline configuration to run on every
pipeline.
diff --git a/doc/user/clusters/applications.md b/doc/user/clusters/applications.md
index c3e2e6bca5b..7ee1650f698 100644
--- a/doc/user/clusters/applications.md
+++ b/doc/user/clusters/applications.md
@@ -417,6 +417,18 @@ install Crossplane using the
[`values.yaml`](https://github.com/crossplaneio/crossplane/blob/master/cluster/charts/crossplane/values.yaml.tmpl)
file.
+#### Enabling installation
+
+This is a preliminary release of Crossplane as a GitLab-managed application. By default,
+the ability to install it is disabled.
+
+To allow installation of Crossplane as a GitLab-managed application, ask a GitLab
+administrator to run following command within a Rails console:
+
+```ruby
+Feature.enable(:enable_cluster_application_crossplane)
+```
+
## Upgrading applications
> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/24789) in GitLab 11.8.