diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-24 06:09:28 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-24 06:09:28 +0300 |
| commit | be2f4c5788975597dd7be1c8a3525549770c1216 (patch) | |
| tree | 083ed0d7e29e26d479c00e00d9cb89d74ebbb0ef /doc/topics | |
| parent | 2711c26beaca6c3a5a3be4b65e01557faf0185b6 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/topics')
| -rw-r--r-- | doc/topics/autodevops/index.md | 8 | ||||
| -rw-r--r-- | doc/topics/autodevops/upgrading_postgresql.md | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md index df056963fa2..8af5b6321f1 100644 --- a/doc/topics/autodevops/index.md +++ b/doc/topics/autodevops/index.md @@ -373,7 +373,7 @@ Either way, the resulting Docker image is automatically pushed to the #### Auto Build using a Dockerfile -If a project's repository contains a `Dockerfile`, Auto Build will use +If a project's repository contains a `Dockerfile` at its root, Auto Build will use `docker build` to create a Docker image. If you are also using Auto Review Apps and Auto Deploy and choose to provide @@ -1351,8 +1351,7 @@ service: #### Deploy policy for staging and production environments -> [Introduced](https://gitlab.com/gitlab-org/gitlab-ci-yml/-/merge_requests/160) -in GitLab 10.8. +> [Introduced](https://gitlab.com/gitlab-org/gitlab-ci-yml/-/merge_requests/160) in GitLab 10.8. TIP: **Tip:** You can also set this inside your [project's settings](#deployment-strategy). @@ -1370,8 +1369,7 @@ you when you're ready to manually deploy to production. #### Deploy policy for canary environments **(PREMIUM)** -> [Introduced](https://gitlab.com/gitlab-org/gitlab-ci-yml/-/merge_requests/171) -in GitLab 11.0. +> [Introduced](https://gitlab.com/gitlab-org/gitlab-ci-yml/-/merge_requests/171) in GitLab 11.0. A [canary environment](../../user/project/canary_deployments.md) can be used before any changes are deployed to production. diff --git a/doc/topics/autodevops/upgrading_postgresql.md b/doc/topics/autodevops/upgrading_postgresql.md index 796aa69469b..fe2393edfc8 100644 --- a/doc/topics/autodevops/upgrading_postgresql.md +++ b/doc/topics/autodevops/upgrading_postgresql.md @@ -212,7 +212,7 @@ specific environments, e.g. `staging`. 1. Once connected to the pod, run the following command to restore the database. - You will be asked for the database password, the default is `testing-password`. - - `USERNAME` is the username you have configured for postgres. The default is `user`. + - `USERNAME` is the username you have configured for PostgreSQL. The default is `user`. - `DATABASE_NAME` is usually the environment name. ```sh |