diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-03 09:10:30 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-03 09:10:30 +0300 |
| commit | d3a97bfbd26fe2876f64fa88d0936dfed2246fa1 (patch) | |
| tree | 0d5ddf529ad894122d120b09f4f3eed31853fe32 /doc | |
| parent | 036de62f732d946bba13be217f5d86fe65638dc5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/api/group_clusters.md | 2 | ||||
| -rw-r--r-- | doc/development/ee_features.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/api/group_clusters.md b/doc/api/group_clusters.md index 69b54591d0a..ea7c13637c4 100644 --- a/doc/api/group_clusters.md +++ b/doc/api/group_clusters.md @@ -8,7 +8,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/30213) in GitLab 12.1. -Similar to [project-level](../user/project/clusters/index.md) and +Similarly to [project-level](../user/project/clusters/index.md) and [instance-level](../user/instance/clusters/index.md) Kubernetes clusters, group-level Kubernetes clusters allow you to connect a Kubernetes cluster to your group, enabling you to use the same cluster across multiple projects. diff --git a/doc/development/ee_features.md b/doc/development/ee_features.md index 35e7824721a..a5b76c32a96 100644 --- a/doc/development/ee_features.md +++ b/doc/development/ee_features.md @@ -20,7 +20,7 @@ Since the implementation of [GitLab CE features to work with unlicensed EE instance](https://gitlab.com/gitlab-org/gitlab/-/issues/2500) GitLab Enterprise Edition should work like GitLab Community Edition when no license is active. So EE features always should be guarded by -`project.feature_available?` or `group.feature_available?` (or +`project.feature_available?` or `group.licensed_feature_available?` (or `License.feature_available?` if it is a system-wide feature). Frontend features should be guarded by pushing a flag from the backend by [using `push_licensed_feature`](licensed_feature_availability.md#restricting-frontend-features), and checked using `this.glFeatures.someFeature` in the frontend. |