diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-11 21:14:04 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-11 21:14:04 +0300 |
commit | 11c2b8eff6ca5360fb0f732b23b764d2a0b81be5 (patch) | |
tree | 7f92622462127ff24023283133f81d9c4b2f6842 /doc/user | |
parent | e40f19ef830c5863089bc6a7a73e6695efa60a13 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/user')
-rw-r--r-- | doc/user/infrastructure/index.md | 2 | ||||
-rw-r--r-- | doc/user/project/merge_requests/approvals/index.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/user/infrastructure/index.md b/doc/user/infrastructure/index.md index 3dcce47105b..3bb518596cc 100644 --- a/doc/user/infrastructure/index.md +++ b/doc/user/infrastructure/index.md @@ -31,7 +31,7 @@ Learn more about how GitLab can help you run [Infrastructure as Code](iac/index. The GitLab integration with Kubernetes helps you to install, configure, manage, deploy, and troubleshoot cluster applications. With the GitLab Kubernetes Agent, you can connect clusters behind a firewall, -have real-time access to API endpoints, perform pull-beased or push-based deployments for production +have real-time access to API endpoints, perform pull-based or push-based deployments for production and non-production environments, and much more. Learn more about the [GitLab Kubernetes Agent](../clusters/agent/index.md). diff --git a/doc/user/project/merge_requests/approvals/index.md b/doc/user/project/merge_requests/approvals/index.md index aff55419a88..d873f715557 100644 --- a/doc/user/project/merge_requests/approvals/index.md +++ b/doc/user/project/merge_requests/approvals/index.md @@ -3,7 +3,7 @@ stage: Create group: Source Code info: "To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments" type: reference, concepts -disqus_identifier: 'https://docs.gitlab.com/ee/user/project/merge_requests/merge_request_approvals.html' +disqus_identifier: 'https://docs.gitlab.com/ee/user/project/merge_requests/approvals/index.html' --- # Merge request approvals **(FREE)** |