From ca95fe0b55e6a350aeb978ecc7fbd31c44ab84f4 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 8 Oct 2019 00:06:10 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- doc/user/index.md | 2 +- doc/user/project/canary_deployments.md | 2 +- doc/user/project/index.md | 2 +- doc/user/project/integrations/prometheus.md | 2 +- doc/user/project/repository/web_editor.md | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'doc') diff --git a/doc/user/index.md b/doc/user/index.md index e1833cab6b8..9b38447a9ae 100644 --- a/doc/user/index.md +++ b/doc/user/index.md @@ -88,7 +88,7 @@ it all at once, from one single project. Use built-in [GitLab CI/CD](../ci/README.md) to test, build, and deploy your applications directly from GitLab. No third-party integrations needed. -- [GitLab Auto Deploy](../ci/autodeploy/index.md): Deploy your application out-of-the-box with GitLab Auto Deploy. +- [GitLab Auto Deploy](../topics/autodevops/index.md#auto-deploy): Deploy your application out-of-the-box with GitLab Auto Deploy. - [Review Apps](../ci/review_apps/index.md): Live-preview the changes introduced by a merge request with Review Apps. - [GitLab Pages](project/pages/index.md): Publish your static site directly from GitLab with GitLab Pages. You can build, test, and deploy any Static Site Generator with Pages. diff --git a/doc/user/project/canary_deployments.md b/doc/user/project/canary_deployments.md index 95ed511d0b3..88205093d74 100644 --- a/doc/user/project/canary_deployments.md +++ b/doc/user/project/canary_deployments.md @@ -44,7 +44,7 @@ Canary deployments require that you properly configure Deploy Boards: 1. Follow the steps to [enable Deploy Boards](deploy_boards.md#enabling-deploy-boards). 1. To track canary deployments you need to label your Kubernetes deployments and - pods with `track: canary`. To get started quickly, you can use the [Auto Deploy](../../ci/autodeploy/index.md) + pods with `track: canary`. To get started quickly, you can use the [Auto Deploy](../../topics/autodevops/index.md#auto-deploy) template for canary deployments that GitLab provides. Depending on the deploy, the label should be either `stable` or `canary`. diff --git a/doc/user/project/index.md b/doc/user/project/index.md index de4db7c80ef..fff587027cf 100644 --- a/doc/user/project/index.md +++ b/doc/user/project/index.md @@ -62,7 +62,7 @@ When you create a project in GitLab, you'll have access to a large number of - [GitLab CI/CD](../../ci/README.md): GitLab's built-in [Continuous Integration, Delivery, and Deployment](https://about.gitlab.com/2016/08/05/continuous-integration-delivery-and-deployment-with-gitlab/) tool - [Container Registry](../packages/container_registry/index.md): Build and push Docker images out-of-the-box - - [Auto Deploy](../../ci/autodeploy/index.md): Configure GitLab CI/CD + - [Auto Deploy](../../topics/autodevops/index.md#auto-deploy): Configure GitLab CI/CD to automatically set up your app's deployment - [Enable and disable GitLab CI](../../ci/enable_or_disable_ci.md) - [Pipelines](../../ci/pipelines.md): Configure and visualize diff --git a/doc/user/project/integrations/prometheus.md b/doc/user/project/integrations/prometheus.md index e00923c3b9b..d7666d00e76 100644 --- a/doc/user/project/integrations/prometheus.md +++ b/doc/user/project/integrations/prometheus.md @@ -445,7 +445,7 @@ If the "No data found" screen continues to appear, it could be due to: [run a query](prometheus_library/kubernetes.html#metrics-supported), replacing `$CI_ENVIRONMENT_SLUG` with the name of your environment. -[autodeploy]: ../../../ci/autodeploy/index.md +[autodeploy]: ../../../topics/autodevops/index.md#auto-deploy [kubernetes]: https://kubernetes.io [kube]: ./kubernetes.md [prometheus-k8s-sd]: https://prometheus.io/docs/operating/configuration/# diff --git a/doc/user/project/repository/web_editor.md b/doc/user/project/repository/web_editor.md index a3cfa48e27e..944720c3863 100644 --- a/doc/user/project/repository/web_editor.md +++ b/doc/user/project/repository/web_editor.md @@ -117,7 +117,7 @@ the description field will automatically display the [issue closing pattern](../ merge request is merged. [project-services-doc]: ../integrations/project_services.md -[auto-deploy-doc]: ../../../ci/autodeploy/index.md +[auto-deploy-doc]: ../../../topics/autodevops/index.md#auto-deploy ### Create a new branch from a project's dashboard -- cgit v1.2.3