diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 00:09:41 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 00:09:41 +0000 |
commit | b8e272100415ae1a550a455f4ad091fccb692a1e (patch) | |
tree | dc958725199fb0cda4d39ef16fec9d218f4bf431 /doc/api | |
parent | ae0889b3960606a480d2d09a57bdab59ddba6195 (diff) | |
download | gitlab-ce-b8e272100415ae1a550a455f4ad091fccb692a1e.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api')
-rw-r--r-- | doc/api/group_clusters.md | 6 | ||||
-rw-r--r-- | doc/api/instance_clusters.md | 6 | ||||
-rw-r--r-- | doc/api/invitations.md | 2 | ||||
-rw-r--r-- | doc/api/project_clusters.md | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/doc/api/group_clusters.md b/doc/api/group_clusters.md index 0ad3528fa19..aba7187bf59 100644 --- a/doc/api/group_clusters.md +++ b/doc/api/group_clusters.md @@ -164,8 +164,8 @@ Parameters: | `name` | string | yes | The name of the cluster | | `domain` | string | no | The [base domain](../user/group/clusters/index.md#base-domain) of the cluster | | `management_project_id` | integer | no | The ID of the [management project](../user/clusters/management_project.md) for the cluster | -| `enabled` | boolean | no | Determines if cluster is active or not, defaults to true | -| `managed` | boolean | no | Determines if GitLab will manage namespaces and service accounts for this cluster, defaults to true | +| `enabled` | boolean | no | Determines if cluster is active or not, defaults to `true` | +| `managed` | boolean | no | Determines if GitLab manages namespaces and service accounts for this cluster. Defaults to `true` | | `platform_kubernetes_attributes[api_url]` | string | yes | The URL to access the Kubernetes API | | `platform_kubernetes_attributes[token]` | string | yes | The token to authenticate against Kubernetes | | `platform_kubernetes_attributes[ca_cert]` | string | no | TLS certificate. Required if API is using a self-signed TLS certificate. | @@ -237,7 +237,7 @@ Parameters: | `domain` | string | no | The [base domain](../user/group/clusters/index.md#base-domain) of the cluster | | `management_project_id` | integer | no | The ID of the [management project](../user/clusters/management_project.md) for the cluster | | `enabled` | boolean | no | Determines if cluster is active or not | -| `managed` | boolean | no | Determines if GitLab will manage namespaces and service accounts for this cluster | +| `managed` | boolean | no | Determines if GitLab manages namespaces and service accounts for this cluster | | `platform_kubernetes_attributes[api_url]` | string | no | The URL to access the Kubernetes API | | `platform_kubernetes_attributes[token]` | string | no | The token to authenticate against Kubernetes | | `platform_kubernetes_attributes[ca_cert]` | string | no | TLS certificate. Required if API is using a self-signed TLS certificate. | diff --git a/doc/api/instance_clusters.md b/doc/api/instance_clusters.md index f57a61474dc..56bd09fbb6c 100644 --- a/doc/api/instance_clusters.md +++ b/doc/api/instance_clusters.md @@ -9,7 +9,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/36001) in GitLab 13.2. NOTE: **Note:** -User will need admin access to use these endpoints. +Users need admin access to use these endpoints. Use these API endpoints with your instance clusters, which enable you to use the same cluster across multiple projects. [More information](../user/instance/clusters/index.md) @@ -164,7 +164,7 @@ Parameters: | `environment_scope` | string | no | The associated environment to the cluster. Defaults to `*` | | `management_project_id` | integer | no | The ID of the [management project](../user/clusters/management_project.md) for the cluster | | `enabled` | boolean | no | Determines if cluster is active or not, defaults to `true` | -| `managed` | boolean | no | Determines if GitLab will manage namespaces and service accounts for this cluster, defaults to `true` | +| `managed` | boolean | no | Determines if GitLab manages namespaces and service accounts for this cluster. Defaults to `true` | | `platform_kubernetes_attributes[api_url]` | string | yes | The URL to access the Kubernetes API | | `platform_kubernetes_attributes[token]` | string | yes | The token to authenticate against Kubernetes | | `platform_kubernetes_attributes[ca_cert]` | string | no | TLS certificate. Required if API is using a self-signed TLS certificate. | @@ -232,7 +232,7 @@ Parameters: | `environment_scope` | string | no | The associated environment to the cluster | | `management_project_id` | integer | no | The ID of the [management project](../user/clusters/management_project.md) for the cluster | | `enabled` | boolean | no | Determines if cluster is active or not | -| `managed` | boolean | no | Determines if GitLab will manage namespaces and service accounts for this cluster | +| `managed` | boolean | no | Determines if GitLab manages namespaces and service accounts for this cluster | | `platform_kubernetes_attributes[api_url]` | string | no | The URL to access the Kubernetes API | | `platform_kubernetes_attributes[token]` | string | no | The token to authenticate against Kubernetes | | `platform_kubernetes_attributes[ca_cert]` | string | no | TLS certificate. Required if API is using a self-signed TLS certificate. | diff --git a/doc/api/invitations.md b/doc/api/invitations.md index 6fd2b26d80f..b6dc83201a8 100644 --- a/doc/api/invitations.md +++ b/doc/api/invitations.md @@ -23,7 +23,7 @@ levels are defined in the `Gitlab::Access` module. Currently, these levels are v CAUTION: **Caution:** Due to [an issue](https://gitlab.com/gitlab-org/gitlab/-/issues/219299), -projects in personal namespaces will not show owner (`50`) permission. +projects in personal namespaces don't show owner (`50`) permission. ## Invite by email to group or project diff --git a/doc/api/project_clusters.md b/doc/api/project_clusters.md index 44b16e188af..16b3839b61c 100644 --- a/doc/api/project_clusters.md +++ b/doc/api/project_clusters.md @@ -190,7 +190,7 @@ Parameters: | `domain` | string | no | The [base domain](../user/project/clusters/index.md#base-domain) of the cluster | | `management_project_id` | integer | no | The ID of the [management project](../user/clusters/management_project.md) for the cluster | | `enabled` | boolean | no | Determines if cluster is active or not, defaults to `true` | -| `managed` | boolean | no | Determines if GitLab will manage namespaces and service accounts for this cluster, defaults to `true` | +| `managed` | boolean | no | Determines if GitLab manages namespaces and service accounts for this cluster. Defaults to `true` | | `platform_kubernetes_attributes[api_url]` | string | yes | The URL to access the Kubernetes API | | `platform_kubernetes_attributes[token]` | string | yes | The token to authenticate against Kubernetes | | `platform_kubernetes_attributes[ca_cert]` | string | no | TLS certificate. Required if API is using a self-signed TLS certificate. | @@ -287,7 +287,7 @@ Parameters: | `domain` | string | no | The [base domain](../user/project/clusters/index.md#base-domain) of the cluster | | `management_project_id` | integer | no | The ID of the [management project](../user/clusters/management_project.md) for the cluster | | `enabled` | boolean | no | Determines if cluster is active or not | -| `managed` | boolean | no | Determines if GitLab will manage namespaces and service accounts for this cluster | +| `managed` | boolean | no | Determines if GitLab manages namespaces and service accounts for this cluster | | `platform_kubernetes_attributes[api_url]` | string | no | The URL to access the Kubernetes API | | `platform_kubernetes_attributes[token]` | string | no | The token to authenticate against Kubernetes | | `platform_kubernetes_attributes[ca_cert]` | string | no | TLS certificate. Required if API is using a self-signed TLS certificate. | |