summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Le Breton <lebreton.gabriel@gmail.com>2018-07-31 14:40:09 -0400
committerRémy Coutable <remy@rymai.me>2018-08-21 19:49:12 +0200
commit0921d247508039e3f221d2ffdba041f79984e3bd (patch)
treef2a55e3bc8624cdd1e043169f50ad486f7b2bc11
parentb11adc8a6c11b04fac65fd8ac7c2b56ffade4fbc (diff)
downloadgitlab-ce-0921d247508039e3f221d2ffdba041f79984e3bd.tar.gz
Fix link to default chart and fix a typo
Originally submitted at https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/6724. Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--doc/topics/autodevops/index.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md
index 0474182e324..c0268ce136c 100644
--- a/doc/topics/autodevops/index.md
+++ b/doc/topics/autodevops/index.md
@@ -450,7 +450,7 @@ executed somewhere else, it cannot be accessed again.
> [Introduced][ce-19507] in GitLab 11.0.
-For internal and private projects a [GitLab Deploy Token](../../user/project/deploy_tokens/index.md###gitlab-deploy-token)
+For internal and private projects a [GitLab Deploy Token](../../user/project/deploy_tokens/index.md###gitlab-deploy-token)
will be automatically created, when Auto DevOps is enabled and the Auto DevOps settings are saved. This Deploy Token
can be used for permanent access to the registry.
@@ -574,13 +574,13 @@ postgres://user:password@postgres-host:postgres-port/postgres-database
### Environment variables
The following variables can be used for setting up the Auto DevOps domain,
-providing a custom Helm chart, or scaling your application. PostgreSQL can be
+providing a custom Helm chart, or scaling your application. PostgreSQL can
also be customized, and you can easily use a [custom buildpack](#custom-buildpacks).
| **Variable** | **Description** |
| ------------ | --------------- |
| `AUTO_DEVOPS_DOMAIN` | The [Auto DevOps domain](#auto-devops-domain); by default set automatically by the [Auto DevOps setting](#enabling-auto-devops). |
-| `AUTO_DEVOPS_CHART` | The Helm Chart used to deploy your apps; defaults to the one [provided by GitLab](https://gitlab.com/charts/charts.gitlab.io/tree/master/charts/auto-deploy-app). |
+| `AUTO_DEVOPS_CHART` | The Helm Chart used to deploy your apps; defaults to the one [provided by GitLab](https://gitlab.com/charts/auto-deploy-app). |
| `REPLICAS` | The number of replicas to deploy; defaults to 1. |
| `PRODUCTION_REPLICAS` | The number of replicas to deploy in the production environment. This takes precedence over `REPLICAS`; defaults to 1. |
| `CANARY_REPLICAS` | The number of canary replicas to deploy for [Canary Deployments](https://docs.gitlab.com/ee/user/project/canary_deployments.html); defaults to 1 |