Add latest changes from gitlab-org/gitlab@master

5 files changed, 65 insertions, 64 deletions

diff --git a/doc/api/features.md b/doc/api/features.md
index 78457076064..e0b2bc920ce 100644
--- a/doc/api/features.md
+++ b/doc/api/features.md
@@ -102,7 +102,7 @@ Example response:
 
 ### Set percentage of actors rollout
 
-Rollout to percentage of users.
+Rollout to percentage of actors.
 
 ```plaintext
 POST https://gitlab.example.com/api/v4/features/my_user_feature?private_token=<your_access_token>
@@ -122,14 +122,14 @@ Example response:
       "value": false
     },
     {
-      "key": "percentage_of_time",
+      "key": "percentage_of_actors",
       "value": 42
     }
   ]
 }
 ```
 
-Rolls out the `my_user_feature` to `42%` of users.
+Rolls out the `my_user_feature` to `42%` of actors.
 
 ## Delete a feature
 
diff --git a/doc/development/pipelines.md b/doc/development/pipelines.md
index 3d7152cc011..ad337062697 100644
--- a/doc/development/pipelines.md
+++ b/doc/development/pipelines.md
@@ -237,7 +237,6 @@ graph RL;
   click 2_1-3 "https://app.periscopedata.com/app/gitlab/652085/Engineering-Productivity---Pipeline-Build-Durations?widget=8356729&udv=0"
   2_1-4["run-dev-fixtures-ee (5 minutes)"];
   click 2_1-4 "https://app.periscopedata.com/app/gitlab/652085/Engineering-Productivity---Pipeline-Build-Durations?widget=8356731&udv=0"
-
   subgraph "Needs `setup-test-env`";
     2_1-1 & 2_1-2 & 2_1-3 & 2_1-4 --> 1-6;
   end
@@ -253,28 +252,27 @@ graph RL;
   click 2_2-4 "https://app.periscopedata.com/app/gitlab/652085/Engineering-Productivity---Pipeline-Build-Durations?widget=8356727&udv=0"
   2_2-5["webpack-dev-server (7.62 minutes)"];
   click 2_2-5 "https://app.periscopedata.com/app/gitlab/652085/Engineering-Productivity---Pipeline-Build-Durations?widget=8404303&udv=0"
-
-  2_3-1["build-assets-image"];
-  class 2_3-1 criticalPath;
-
   subgraph "Needs `setup-test-env` & `compile-assets`";
     2_2-1 & 2_2-2 & 2_2-4 & 2_2-5 --> 1-6 & 1-3;
     2_2-3 --> 1-6 & 1-4;
   end
 
+  2_3-1["build-assets-image (2.5 minutes)"];
   subgraph "Needs `gitlab:assets:compile`";
     2_3-1 --> 1-5
   end
 
-  subgraph "Needs `build-qa-image` & `build-assets-image`";
-    2_4-1["package-and-qa (manual)"] --> 1-2 & 2_3-1;
+  2_4-1["package-and-qa (manual)"];
+  subgraph "Needs `build-qa-image`";
+    2_4-1 --> 1-2;
     click 2_4-1 "https://app.periscopedata.com/app/gitlab/652085/Engineering-Productivity---Pipeline-Build-Durations?widget=6914305&udv=0"
   end
 
-  subgraph "Needs `compile-assets`, `setup-test-env, & `retrieve-tests-metadata`";
-    2_4-1["rspec & db jobs (12-22 minutes)"] --> 1-3 & 1-6 & 1-14;
-    class 2_4-1 criticalPath;
-    click 2_4-1 "https://app.periscopedata.com/app/gitlab/652085/Engineering-Productivity---Pipeline-Build-Durations"
+  2_5-1["rspec & db jobs (12-22 minutes)"];
+  subgraph "Needs `compile-assets`, `setup-test-env`, & `retrieve-tests-metadata`";
+    2_5-1 --> 1-3 & 1-6 & 1-14;
+    class 2_5-1 criticalPath;
+    click 2_5-1 "https://app.periscopedata.com/app/gitlab/652085/Engineering-Productivity---Pipeline-Build-Durations"
   end
 
   3_1-1["jest (11.2 minutes)"];
@@ -286,20 +284,21 @@ graph RL;
   click 3_1-3 "https://app.periscopedata.com/app/gitlab/652085/Engineering-Productivity---Pipeline-Build-Durations?widget=6914205&udv=0"
   3_1-4["karma-as-if-foss (8.25 minutes)"];
   click 3_1-4 "https://app.periscopedata.com/app/gitlab/652085/Engineering-Productivity---Pipeline-Build-Durations?widget=6914203&udv=0"
-
   subgraph "Needs `frontend-fixtures`";
     3_1-1 & 3_1-2 --> 2_2-2;
     3_1-3 & 3_1-4 --> 2_2-3;
   end
 
+  3_2-1["rspec:coverage (7.67 minutes)"];
   subgraph "Depends on `rspec` jobs";
-    3_2-1["rspec:coverage (7.67 minutes)"] -.->|"(don't use needs because of limitations)"| 2_4-1;
+    3_2-1 -.->|"(don't use needs because of limitations)"| 2_5-1;
     class 3_2-1 criticalPath;
     click 3_2-1 "https://app.periscopedata.com/app/gitlab/652085/Engineering-Productivity---Pipeline-Build-Durations?widget=7248745&udv=0"
   end
 
+  4_1-1["coverage-frontend (5.39 minutes)"];
   subgraph "Needs `jest`";
-    4_1-1["coverage-frontend (5.39 minutes)"] --> 3_1-1;
+    4_1-1 --> 3_1-1;
     class 4_1-1 criticalPath;
     click 4_1-1 "https://app.periscopedata.com/app/gitlab/652085/Engineering-Productivity---Pipeline-Build-Durations?widget=7910777&udv=0"
   end
@@ -352,7 +351,6 @@ graph RL;
   click 2_1-3 "https://app.periscopedata.com/app/gitlab/652085/Engineering-Productivity---Pipeline-Build-Durations?widget=8356729&udv=0"
   2_1-4["run-dev-fixtures-ee (5 minutes)"];
   click 2_1-4 "https://app.periscopedata.com/app/gitlab/652085/Engineering-Productivity---Pipeline-Build-Durations?widget=8356731&udv=0"
-
   subgraph "Needs `setup-test-env`";
     2_1-1 & 2_1-2 & 2_1-3 & 2_1-4 --> 1-6;
   end
@@ -368,32 +366,33 @@ graph RL;
   click 2_2-4 "https://app.periscopedata.com/app/gitlab/652085/Engineering-Productivity---Pipeline-Build-Durations?widget=8356727&udv=0"
   2_2-5["webpack-dev-server (7.62 minutes)"];
   click 2_2-5 "https://app.periscopedata.com/app/gitlab/652085/Engineering-Productivity---Pipeline-Build-Durations?widget=8404303&udv=0"
-
-  2_3-1["build-assets-image"];
-  class 2_3-1 criticalPath;
-
   subgraph "Needs `setup-test-env` & `compile-assets`";
     2_2-1 & 2_2-2 & 2_2-4 & 2_2-5 --> 1-6 & 1-3;
     2_2-3 --> 1-6 & 1-4;
   end
 
+  2_3-1["build-assets-image (2.5 minutes)"];
+  class 2_3-1 criticalPath;
   subgraph "Needs `gitlab:assets:compile`";
     2_3-1 --> 1-5
   end
 
+  2_4-1["package-and-qa (manual)"];
   subgraph "Needs `build-qa-image` & `build-assets-image`";
-    2_4-1["package-and-qa (manual)"] --> 1-2 & 2_3-1;
+    2_4-1 --> 1-2 & 2_3-1;
     click 2_4-1 "https://app.periscopedata.com/app/gitlab/652085/Engineering-Productivity---Pipeline-Build-Durations?widget=6914305&udv=0"
   end
 
+  2_5-1["rspec & db jobs (12-22 minutes)"];
   subgraph "Needs `compile-assets`, `setup-test-env, & `retrieve-tests-metadata`";
-    2_5-1["rspec & db jobs (12-22 minutes)"] --> 1-3 & 1-6 & 1-14;
+    2_5-1 --> 1-3 & 1-6 & 1-14;
     class 2_5-1 criticalPath;
     click 2_5-1 "https://app.periscopedata.com/app/gitlab/652085/Engineering-Productivity---Pipeline-Build-Durations"
   end
 
+  2_6-1["review-build-cng (27.3 minutes)"];
   subgraph "Needs `build-assets-image`";
-    2_6-1["review-build-cng (27.3 minutes)"] --> 2_3-1;
+    2_6-1 --> 2_3-1;
     class 2_6-1 criticalPath;
     click 2_6-1 "https://app.periscopedata.com/app/gitlab/652085/Engineering-Productivity---Pipeline-Build-Durations?widget=6914314&udv=0"
   end
@@ -407,38 +406,39 @@ graph RL;
   click 3_1-3 "https://app.periscopedata.com/app/gitlab/652085/Engineering-Productivity---Pipeline-Build-Durations?widget=6914205&udv=0"
   3_1-4["karma-as-if-foss (8.25 minutes)"];
   click 3_1-4 "https://app.periscopedata.com/app/gitlab/652085/Engineering-Productivity---Pipeline-Build-Durations?widget=6914203&udv=0"
-
   subgraph "Needs `frontend-fixtures`";
     3_1-1 & 3_1-3 --> 2_2-2;
     3_1-2 & 3_1-4 --> 2_2-3;
   end
 
+  3_2-1["rspec:coverage (7.67 minutes)"];
   subgraph "Depends on `rspec` jobs";
-    3_2-1["rspec:coverage (7.67 minutes)"] -.->|"(don't use needs because of limitations)"| 2_5-1;
+    3_2-1 -.->|"(don't use needs because of limitations)"| 2_5-1;
     class 3_2-1 criticalPath;
     click 3_2-1 "https://app.periscopedata.com/app/gitlab/652085/Engineering-Productivity---Pipeline-Build-Durations?widget=7248745&udv=0"
   end
 
+  4_1-1["coverage-frontend (5.39 minutes)"];
   subgraph "Needs `jest`";
-    4_1-1["coverage-frontend (5.39 minutes)"] --> 3_1-1;
+    4_1-1 --> 3_1-1;
     class 4_1-1 criticalPath;
     click 4_1-1 "https://app.periscopedata.com/app/gitlab/652085/Engineering-Productivity---Pipeline-Build-Durations?widget=7910777&udv=0"
   end
 
+  3_3-1["review-deploy (6 minutes)"];
   subgraph "Played by `review-build-cng`";
-    3_3-1["review-deploy (6 minutes)"] --> 2_6-1;
+    3_3-1 --> 2_6-1;
     class 3_3-1 criticalPath;
     click 3_3-1 "https://app.periscopedata.com/app/gitlab/652085/Engineering-Productivity---Pipeline-Build-Durations?widget=6721130&udv=0"
   end
 
   4_2-1["review-qa-smoke (7.29 minutes)"];
-  class 4_2-1 criticalPath;
   click 4_2-1 "https://app.periscopedata.com/app/gitlab/652085/Engineering-Productivity---Pipeline-Build-Durations?widget=6729805&udv=0"
   4_2-2["review-performance (3.83 minutes)"];
   click 4_2-2 "https://app.periscopedata.com/app/gitlab/652085/Engineering-Productivity---Pipeline-Build-Durations?widget=8356817&udv=0"
-  4_2-3["dast (16.4 minutes)"];
+  4_2-3["dast (18 minutes)"];
   click 4_2-3 "https://app.periscopedata.com/app/gitlab/652085/Engineering-Productivity---Pipeline-Build-Durations?widget=8356819&udv=0"
-
+  class 4_2-3 criticalPath;
   subgraph "Played by `review-deploy`";
     4_2-1 & 4_2-2 & 4_2-3 -.->|"(don't use needs because of limitations)"| 3_3-1;
   end
@@ -478,32 +478,30 @@ graph RL;
     1-19["nodejs-scan-sast"];
     1-20["secrets-sast"];
 
-    class 1-3 criticalPath;
     class 1-5 criticalPath;
-    class 1-6 criticalPath;
   end
 
   2_1-1["graphql-reference-verify (5 minutes)"];
   click 2_1-1 "https://app.periscopedata.com/app/gitlab/652085/Engineering-Productivity---Pipeline-Build-Durations?widget=8356715&udv=0"
-
   subgraph "Needs `setup-test-env`";
     2_1-1 --> 1-6;
   end
 
   2_2-1["static-analysis (17 minutes)"];
   click 2_2-1 "https://app.periscopedata.com/app/gitlab/652085/Engineering-Productivity---Pipeline-Build-Durations?widget=6914471&udv=0"
-
   subgraph "Needs `setup-test-env` & `compile-assets`";
     2_2-1 --> 1-6 & 1-3;
   end
 
+  2_3-1["build-assets-image (2.5 minutes)"];
   subgraph "Needs `gitlab:assets:compile`";
-    2_3-1["build-assets-image (2 minutes)"] --> 1-5
+    2_3-1 --> 1-5
     class 2_3-1 criticalPath;
   end
 
+  2_4-1["package-and-qa (108 minutes)"];
   subgraph "Needs `build-qa-image` & `build-assets-image`";
-    2_4-1["package-and-qa (108 minutes)"] --> 1-2 & 2_3-1;
+    2_4-1 --> 1-2 & 2_3-1;
     class 2_4-1 criticalPath;
     click 2_4-1 "https://app.periscopedata.com/app/gitlab/652085/Engineering-Productivity---Pipeline-Build-Durations?widget=6914305&udv=0"
   end
diff --git a/doc/topics/autodevops/customize.md b/doc/topics/autodevops/customize.md
index 7935b41e6a6..7d3c24f5457 100644
--- a/doc/topics/autodevops/customize.md
+++ b/doc/topics/autodevops/customize.md
@@ -245,23 +245,19 @@ postgres://user:password@postgres-host:postgres-port/postgres-database
 
 CAUTION: **Deprecation**
 The variable `AUTO_DEVOPS_POSTGRES_CHANNEL` that controls default provisioned
-PostgreSQL currently defaults to `1`. This value is scheduled to change to `2` in
-[GitLab 13.0](https://gitlab.com/gitlab-org/gitlab/-/issues/210499).
+PostgreSQL was changed to `2` in [GitLab 13.0](https://gitlab.com/gitlab-org/gitlab/-/issues/210499).
+To keep using the old PostgreSQL, set the `AUTO_DEVOPS_POSTGRES_CHANNEL` variable to
+`1`.
 
 The version of the chart used to provision PostgreSQL:
 
+- Is 8.2.1 in GitLab 13.0 and later, but can be set back to 0.7.1 if needed.
+- Can be set to from 0.7.1 to 8.2.1 in GitLab 12.9 and 12.10.
 - Is 0.7.1 in GitLab 12.8 and earlier.
-- Can be set to from 0.7.1 to 8.2.1 in GitLab 12.9 and later.
 
 GitLab encourages users to [migrate their database](upgrading_postgresql.md)
 to the newer PostgreSQL.
 
-To use the new PostgreSQL:
-
-- New projects can set the `AUTO_DEVOPS_POSTGRES_CHANNEL` variable to `2`.
-- Old projects can be upgraded by following the guide to
-  [upgrading PostgresSQL](upgrading_postgresql.md).
-
 ### Using external PostgreSQL database providers
 
 While Auto DevOps provides out-of-the-box support for a PostgreSQL container for
@@ -352,7 +348,7 @@ The following table lists variables related to the database.
 | `POSTGRES_USER`                         | The PostgreSQL user. Defaults to `user`. Set it to use a custom username. |
 | `POSTGRES_PASSWORD`                     | The PostgreSQL password. Defaults to `testing-password`. Set it to use a custom password. |
 | `POSTGRES_DB`                           | The PostgreSQL database name. Defaults to the value of [`$CI_ENVIRONMENT_SLUG`](../../ci/variables/README.md#predefined-environment-variables). Set it to use a custom database name. |
-| `POSTGRES_VERSION`                      | Tag for the [`postgres` Docker image](https://hub.docker.com/_/postgres) to use. Defaults to `11.7`. |
+| `POSTGRES_VERSION`                      | Tag for the [`postgres` Docker image](https://hub.docker.com/_/postgres) to use. Defaults to `9.6.16` for tests and deployments as of GitLab 13.0 (previously `9.6.2`). If `AUTO_DEVOPS_POSTGRES_CHANNEL` is set to `1`, deployments will use the default version `9.6.2`. |
 
 ### Disable jobs
 
diff --git a/doc/topics/autodevops/stages.md b/doc/topics/autodevops/stages.md
index 3dcde4ab065..85b4e67049f 100644
--- a/doc/topics/autodevops/stages.md
+++ b/doc/topics/autodevops/stages.md
@@ -324,34 +324,40 @@ as it attempts to fetch the image using `CI_REGISTRY_PASSWORD`.
 
 > - [Introduced](https://gitlab.com/gitlab-org/charts/auto-deploy-app/-/merge_requests/51) in GitLab 12.8.
 > - Support for deploying a PostgreSQL version that supports Kubernetes 1.16+ was [introduced](https://gitlab.com/gitlab-org/cluster-integration/auto-deploy-image/-/merge_requests/49) in GitLab 12.9.
+> - Supported out of the box for new deployments as of GitLab 13.0.
 
 CAUTION: **Deprecation**
-The default value of `extensions/v1beta1` for the `deploymentApiVersion` setting is
-deprecated, and is scheduled to be changed to a new default of `apps/v1` in
-[GitLab 13.0](https://gitlab.com/gitlab-org/charts/auto-deploy-app/issues/47).
+The default value for the `deploymentApiVersion` setting was changed from
+`extensions/v1beta` to `apps/v1` in [GitLab 13.0](https://gitlab.com/gitlab-org/charts/auto-deploy-app/issues/47).
 
 In Kubernetes 1.16 and later, a number of
 [APIs were removed](https://kubernetes.io/blog/2019/07/18/api-deprecations-in-1-16/),
 including support for `Deployment` in the `extensions/v1beta1` version.
 
-To use Auto Deploy on a Kubernetes 1.16+ cluster, you must opt-in to using a
-version of the PostgreSQL chart that supports Kubernetes 1.16 and higher:
+To use Auto Deploy on a Kubernetes 1.16+ cluster:
 
-1. Set the following in the [`.gitlab/auto-deploy-values.yaml` file](customize.md#customize-values-for-helm-chart):
+1. If you are deploying your application for the first time on GitLab 13.0 or
+   newer, no configuration should be required.
+
+1. On GitLab 12.10 or older, set the following in the [`.gitlab/auto-deploy-values.yaml` file](customize.md#customize-values-for-helm-chart):
 
    ```yml
    deploymentApiVersion: apps/v1
    ```
 
-1. Set the:
+1. If you have an in-cluster PostgreSQL database installed with
+   `AUTO_DEVOPS_POSTGRES_CHANNEL` set to `1`, follow the [guide to upgrade
+   PostgreSQL](upgrading_postgresql.md).
 
-   - `AUTO_DEVOPS_POSTGRES_CHANNEL` variable to `2`.
-   - `POSTGRES_VERSION` variable to `11.7` or higher.
+1. If you are deploying your application for the first time and are using
+   GitLab 12.9 or 12.10, set `AUTO_DEVOPS_POSTGRES_CHANNEL` to `2`.
 
-DANGER: **Danger:** Opting into `AUTO_DEVOPS_POSTGRES_CHANNEL` version `2` deletes
-the version `1` PostgreSQL database. Follow the
-[guide to upgrading PostgreSQL](upgrading_postgresql.md) to back up and restore
-your database before opting into version `2`.
+DANGER: **Danger:** On GitLab 12.9 and 12.10, opting into
+`AUTO_DEVOPS_POSTGRES_CHANNEL` version `2` deletes the version `1` PostgreSQL
+database. Follow the [guide to upgrading PostgreSQL](upgrading_postgresql.md)
+to back up and restore your database before opting into version `2` (On
+GitLab 13.0, an additional variable is required to trigger the database
+deletion).
 
 ### Migrations
 
diff --git a/doc/user/application_security/index.md b/doc/user/application_security/index.md
index 8f591641396..279c31565ef 100644
--- a/doc/user/application_security/index.md
+++ b/doc/user/application_security/index.md
@@ -75,9 +75,10 @@ The scanning tools and vulnerabilities database are updated regularly.
 | [Static Application Security Testing (SAST)](sast/index.md)  | Relies exclusively on [the tools GitLab wraps](sast/index.md#supported-languages-and-frameworks). The underlying analyzers are updated at least once per month if a relevant update is available. The vulnerabilities database is updated by the upstream tools. |
 
 Currently, you do not have to update GitLab to benefit from the latest vulnerabilities definitions.
-The security tools are released as Docker images. The vendored job definitions to enable them use
-the `x-y-stable` image tags that get overridden each time a new release of the tools is pushed. The
-Docker images are updated to match the previous GitLab releases, so users automatically get the
+The security tools are released as Docker images. The vendored job definitions that enable them use
+major release tags according to [Semantic Versioning](https://semver.org/). Each new release of the
+tools overrides these tags.
+The Docker images are updated to match the previous GitLab releases, so users automatically get the
 latest versions of the scanning tools without having to do anything. There are some known issues
 with this approach, however, and there is a
 [plan to resolve them](https://gitlab.com/gitlab-org/gitlab/issues/9725).