Add latest changes from gitlab-org/gitlab@12-10-stable-ee

6 files changed, 26 insertions, 15 deletions

diff --git a/doc/topics/airgap/index.md b/doc/topics/airgap/index.md
index 44589c7e5f8..e712e3bb6b5 100644
--- a/doc/topics/airgap/index.md
+++ b/doc/topics/airgap/index.md
@@ -18,7 +18,7 @@ Follow these best practices to use GitLab's features in an offline environment:
 
 To use many GitLab features, including
 [security scans](../../user/application_security/index.md#working-in-an-offline-environment)
-and [Auto Devops](../autodevops/), the GitLab Runner must be able to fetch the
+and [Auto DevOps](../autodevops/), the GitLab Runner must be able to fetch the
 relevant Docker images.
 
 The process for making these images available without direct access to the public internet
diff --git a/doc/topics/autodevops/customize.md b/doc/topics/autodevops/customize.md
index d373c3212c3..7c587ad3444 100644
--- a/doc/topics/autodevops/customize.md
+++ b/doc/topics/autodevops/customize.md
@@ -218,6 +218,16 @@ include:
 
 See the [Auto DevOps template](https://gitlab.com/gitlab-org/gitlab/blob/master/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml) for information on available jobs.
 
+CAUTION: **Deprecation**
+Auto DevOps templates using the [`only`](../../ci/yaml/README.md#onlyexcept-basic) or
+[`except`](../../ci/yaml/README.md#onlyexcept-basic) syntax will switch
+to the [`rules`](../../ci/yaml/README.md#rules) syntax, starting in
+[GitLab 13.0](https://gitlab.com/gitlab-org/gitlab/-/issues/213336).
+If your `.gitlab-ci.yml` extends these Auto DevOps templates and override the `only` or
+`except` keywords, you must migrate your templates to use the
+[`rules`](../../ci/yaml/README.md#rules) syntax after the
+base template is migrated to use the `rules` syntax.
+
 ## PostgreSQL database support
 
 To support applications requiring a database,
diff --git a/doc/topics/autodevops/img/guide_project_landing_page_v12_10.png b/doc/topics/autodevops/img/guide_project_landing_page_v12_10.png
index ec646c50a20..54e7141dad2 100644
--- a/doc/topics/autodevops/img/guide_project_landing_page_v12_10.png
+++ b/doc/topics/autodevops/img/guide_project_landing_page_v12_10.png
diff --git a/doc/topics/autodevops/quick_start_guide.md b/doc/topics/autodevops/quick_start_guide.md
index 3fb4aa64f3f..53d5e664bc1 100644
--- a/doc/topics/autodevops/quick_start_guide.md
+++ b/doc/topics/autodevops/quick_start_guide.md
@@ -64,8 +64,6 @@ to deploy this project to.
 1. On the **Add a Kubernetes cluster integration** page, click the **Create new cluster** tab,
    then click **Google GKE**.
 
-   ![Google sign in](img/guide_google_signin_v12_3.png)
-
 1. Connect with your Google account, and click **Allow** to allow access to your
    Google account. (This authorization request is only displayed the first time
    you connect GitLab with your Google account.)
@@ -86,7 +84,8 @@ to deploy this project to.
    - **Number of nodes**
    - **Machine type** - For more information about
      [machine types](https://cloud.google.com/compute/docs/machine-types), see Google's documentation.
-   - **Enable Cloud Run for Anthos** - Select this checkbox to use the Cloud Run,
+   - **Enable Cloud Run for Anthos** - Select this checkbox to use the
+     [Cloud Run](../../user/project/clusters/add_gke_clusters.md#cloud-run-for-anthos),
      Istio, and HTTP Load Balancing add-ons for this cluster.
    - **GitLab-managed cluster** - Select this checkbox to
      [allow GitLab to manage namespace and service accounts](../..//user/project/clusters/index.md#gitlab-managed-clusters) for this cluster.
@@ -184,7 +183,7 @@ The jobs are separated into stages:
     susceptible to vulnerabilities and is allowed to fail
     ([Auto Dependency Scanning](stages.md#auto-dependency-scanning-ultimate)) **(ULTIMATE)**
   - The `sast` job runs static analysis on the current code to check for potential
-    security issues and is allowed to fail([Auto SAST](stages.md#auto-sast-ultimate)) **(ULTIMATE)**
+    security issues and is allowed to fail ([Auto SAST](stages.md#auto-sast-ultimate)) **(ULTIMATE)**
   - The `license_management` job searches the application's dependencies to determine each of their
     licenses and is allowed to fail
     ([Auto License Compliance](stages.md#auto-license-compliance-ultimate)) **(ULTIMATE)**
@@ -211,15 +210,17 @@ you to common environment tasks:
 
 ![Environments](img/guide_environments_v12_3.png)
 
-- **{external-link}** **Open live environment** - Opens the URL of the application deployed in production
-- **{chart}** **Monitoring** - Opens the metrics page where Prometheus collects data
+- **Open live environment** (**{external-link}**) - Opens the URL of the application deployed in production
+- **Monitoring** (**{chart}**) - Opens the metrics page where Prometheus collects data
   about the Kubernetes cluster and how the application
   affects it in terms of memory usage, CPU usage, and latency
-- **{play}** **{angle-down}** **Deploy to** - Displays a list of environments you can deploy to
-- **{terminal}** **Terminal** - Opens a [web terminal](../../ci/environments.md#web-terminals)
+- **Deploy to** (**{play}** **{angle-down}**) - Displays a list of environments you can deploy to
+- **Terminal** (**{terminal}**) - Opens a [web terminal](../../ci/environments.md#web-terminals)
   session inside the container where the application is running
-- **{repeat}** **Re-deploy to environment**
-- **{stop}** **Stop environment**
+- **Re-deploy to environment** (**{repeat}**) - For more information, see
+  [Retrying and rolling back](../../ci/environments.md#retrying-and-rolling-back)
+- **Stop environment** (**{stop}**) - For more information, see
+  [Stopping an environment](../../ci/environments.md#stopping-an-environment)
 
 GitLab displays the [Deploy Board](../../user/project/deploy_boards.md) below the
 environment's information, with squares representing pods in your
@@ -279,13 +280,13 @@ To fix the broken test:
 1. Change line 7 to say `You're on Rails! Powered by GitLab Auto DevOps.`
 1. Click **Commit**.
 1. In the left-hand column, under **Unstaged changes**, click the checkmark icon
-   to stage the changes.
+   (**{stage-all}**) to stage the changes.
 1. Write a commit message, and click **Commit**.
 
 Return to the **Overview** page of your merge request, and you should not only
 see the test passing, but also the application deployed as a
 [review application](stages.md#auto-review-apps). You can visit it by clicking
-the **View app** button to see your changes deployed.
+the **View app** **{external-link}** button to see your changes deployed.
 
 ![Review app](img/guide_merge_request_review_app_v12_3.png)
 
diff --git a/doc/topics/autodevops/stages.md b/doc/topics/autodevops/stages.md
index 72fa3870abd..66b76dcc05a 100644
--- a/doc/topics/autodevops/stages.md
+++ b/doc/topics/autodevops/stages.md
@@ -474,7 +474,7 @@ To enable ModSecurity with Auto Deploy, you need to create a `.gitlab/auto-deplo
 
 |Attribute | Description | Default |
 -----------|-------------|---------|
-|`enabled` | Enables custom configuration for modsecurity, defaulting to the [Core Rule Set](https://coreruleset.org/) | `false` |
+|`enabled` | Enables custom configuration for ModSecurity, defaulting to the [Core Rule Set](https://coreruleset.org/) | `false` |
 |`secRuleEngine` | Configures the [rules engine](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual-(v2.x)#secruleengine) | `DetectionOnly` |
 |`secRules` | Creates one or more additional [rule](https://github.com/SpiderLabs/ModSecurity/wiki/Reference-Manual-(v2.x)#SecRule) | `nil` |
 
diff --git a/doc/topics/web_application_firewall/quick_start_guide.md b/doc/topics/web_application_firewall/quick_start_guide.md
index 6483a56e7f7..d55ab03a3f2 100644
--- a/doc/topics/web_application_firewall/quick_start_guide.md
+++ b/doc/topics/web_application_firewall/quick_start_guide.md
@@ -213,7 +213,7 @@ the WAF with OWASP CRS!
 ## Testing out the OWASP Core Rule Set
 
 Now let's send a potentially malicious request, as if we were a scanner,
-checking for vulnerabilities within our application and examine the modsecurity logs:
+checking for vulnerabilities within our application and examine the ModSecurity logs:
 
 ```shell
 $ curl --location --insecure fjdiaz-auto-devv-2.34.68.60.207.nip.io --header "User-Agent: absinthe" | grep 'Rails!' --after 2 --before 2