diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-07 00:09:33 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-07 00:09:33 +0000 |
commit | b56027c9d80ac0e297ba8a43c81e8504172dbf9f (patch) | |
tree | b85f743277145e930ae195664655d696e6e0a7fc /doc/ci | |
parent | 7915c41e4261719719e791602c8235574157164c (diff) | |
download | gitlab-ce-b56027c9d80ac0e297ba8a43c81e8504172dbf9f.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/ci')
-rw-r--r-- | doc/ci/README.md | 2 | ||||
-rw-r--r-- | doc/ci/autodeploy/index.md | 4 | ||||
-rw-r--r-- | doc/ci/autodeploy/quick_start_guide.md | 4 | ||||
-rw-r--r-- | doc/ci/introduction/index.md | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/doc/ci/README.md b/doc/ci/README.md index f902400efc2..30971d422cc 100644 --- a/doc/ci/README.md +++ b/doc/ci/README.md @@ -120,7 +120,7 @@ Its feature set is listed on the table below according to DevOps stages. | [Using Docker images](docker/using_docker_images.md) | Use GitLab and GitLab Runner with Docker to build and test applications. | |---+---| | **Release** || -| [Auto Deploy](../topics/autodevops/index.md#auto-deploy) | Deploy your application to a production environment in a Kubernetes cluster. | +| [Auto Deploy](../topics/autodevops/stages.md#auto-deploy) | Deploy your application to a production environment in a Kubernetes cluster. | | [Building Docker images](docker/using_docker_build.md) | Maintain Docker-based projects using GitLab CI/CD. | | [Canary Deployments](../user/project/canary_deployments.md) **(PREMIUM)** | Ship features to only a portion of your pods and let a percentage of your user base to visit the temporarily deployed feature. | | [Deploy Boards](../user/project/deploy_boards.md) **(PREMIUM)** | Check the current health and status of each CI/CD environment running on Kubernetes. | diff --git a/doc/ci/autodeploy/index.md b/doc/ci/autodeploy/index.md index 5221cbf8609..ca2df72e32e 100644 --- a/doc/ci/autodeploy/index.md +++ b/doc/ci/autodeploy/index.md @@ -1,5 +1,5 @@ --- -redirect_to: '../../topics/autodevops/index.md#auto-deploy' +redirect_to: '../../topics/autodevops/stages.md#auto-deploy' --- -This document was moved to [another location](../../topics/autodevops/index.md#auto-deploy). +This document was moved to [another location](../../topics/autodevops/stages.md#auto-deploy). diff --git a/doc/ci/autodeploy/quick_start_guide.md b/doc/ci/autodeploy/quick_start_guide.md index 5221cbf8609..ca2df72e32e 100644 --- a/doc/ci/autodeploy/quick_start_guide.md +++ b/doc/ci/autodeploy/quick_start_guide.md @@ -1,5 +1,5 @@ --- -redirect_to: '../../topics/autodevops/index.md#auto-deploy' +redirect_to: '../../topics/autodevops/stages.md#auto-deploy' --- -This document was moved to [another location](../../topics/autodevops/index.md#auto-deploy). +This document was moved to [another location](../../topics/autodevops/stages.md#auto-deploy). diff --git a/doc/ci/introduction/index.md b/doc/ci/introduction/index.md index 069430579e3..b16cde54b93 100644 --- a/doc/ci/introduction/index.md +++ b/doc/ci/introduction/index.md @@ -199,7 +199,7 @@ according to each stage (Verify, Package, Release). - Deploy your features behind [Feature Flags](../../user/project/operations/feature_flags.md). **(PREMIUM)** - Add release notes to any Git tag with [GitLab Releases](../../user/project/releases/index.md). - View of the current health and status of each CI environment running on Kubernetes with [Deploy Boards](../../user/project/deploy_boards.md). **(PREMIUM)** - - Deploy your application to a production environment in a Kubernetes cluster with [Auto Deploy](../../topics/autodevops/index.md#auto-deploy). + - Deploy your application to a production environment in a Kubernetes cluster with [Auto Deploy](../../topics/autodevops/stages.md#auto-deploy). With GitLab CI/CD you can also: |