Add latest changes from gitlab-org/gitlab@master

11 files changed, 477 insertions, 286 deletions

diff --git a/doc/administration/auth/README.md b/doc/administration/auth/README.md
index f30d6be1775..1c5b00b36ad 100644
--- a/doc/administration/auth/README.md
+++ b/doc/administration/auth/README.md
@@ -32,4 +32,3 @@ providers:
 - [Shibboleth](../../integration/shibboleth.md)
 - [Smartcard](smartcard.md) **(PREMIUM ONLY)**
 - [Twitter](../../integration/twitter.md)
-- [UltraAuth](../../integration/ultra_auth.md)
diff --git a/doc/api/feature_flag_specs.md b/doc/api/feature_flag_specs.md
index 5669809349b..ff05c4f6fe4 100644
--- a/doc/api/feature_flag_specs.md
+++ b/doc/api/feature_flag_specs.md
@@ -2,7 +2,10 @@
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/9566) in [GitLab Premium](https://about.gitlab.com/pricing/) 12.5.
 
-The API for creating, updating, reading and deleting [Feature Flag Specs](../user/project/operations/feature_flags.md#define-environment-specs).
+CAUTION: **Deprecation**
+This API is deprecated and [scheduled for removal in GitLab 14.0](https://gitlab.com/gitlab-org/gitlab/-/issues/213369).
+
+The API for creating, updating, reading and deleting Feature Flag Specs.
 Automation engineers benefit from this API by being able to modify Feature Flag Specs without accessing user interface.
 To manage the [Feature Flag](../user/project/operations/feature_flags.md) resources via public API, please refer to the [Feature Flags API](feature_flags.md) document.
 
diff --git a/doc/api/feature_flags.md b/doc/api/feature_flags.md
index e58edd047de..ff9b754ada7 100644
--- a/doc/api/feature_flags.md
+++ b/doc/api/feature_flags.md
@@ -2,6 +2,9 @@
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/9566) in [GitLab Premium](https://about.gitlab.com/pricing/) 12.5.
 
+NOTE: **Note**
+This API is behind a [feature flag](../user/project/operations/feature_flags.md#feature-flag-behavior-change-in-130). If this flag is not enabled in your environment, you can use the [legacy feature flags API](feature_flags_legacy.md).
+
 API for accessing resources of [GitLab Feature Flags](../user/project/operations/feature_flags.md).
 
 Users with Developer or higher [permissions](../user/permissions.md) can access Feature Flag API.
@@ -35,113 +38,94 @@ Example response:
    {
       "name":"merge_train",
       "description":"This feature is about merge train",
+      "version": "new_version_flag",
       "created_at":"2019-11-04T08:13:51.423Z",
       "updated_at":"2019-11-04T08:13:51.423Z",
-      "scopes":[
-         {
-            "id":82,
-            "active":false,
-            "environment_scope":"*",
-            "strategies":[
-               {
-                  "name":"default",
-                  "parameters":{
-
-                  }
-               }
-            ],
-            "created_at":"2019-11-04T08:13:51.425Z",
-            "updated_at":"2019-11-04T08:13:51.425Z"
-         },
-         {
-            "id":83,
-            "active":true,
-            "environment_scope":"review/*",
-            "strategies":[
-               {
-                  "name":"default",
-                  "parameters":{
-
-                  }
-               }
-            ],
-            "created_at":"2019-11-04T08:13:51.427Z",
-            "updated_at":"2019-11-04T08:13:51.427Z"
-         },
-         {
-            "id":84,
-            "active":false,
-            "environment_scope":"production",
-            "strategies":[
-               {
-                  "name":"default",
-                  "parameters":{
-
-                  }
-               }
-            ],
-            "created_at":"2019-11-04T08:13:51.428Z",
-            "updated_at":"2019-11-04T08:13:51.428Z"
-         }
+      "scopes":[],
+      "strategies": [
+        {
+          "id": 1,
+          "name": "userWithId",
+          "parameters": {
+            "userIds": "user1"
+          },
+          "scopes": [
+            {
+              "id": 1,
+              "environment_scope": "production"
+            }
+          ]
+        }
       ]
    },
    {
       "name":"new_live_trace",
       "description":"This is a new live trace feature",
+      "version": "new_version_flag",
       "created_at":"2019-11-04T08:13:10.507Z",
       "updated_at":"2019-11-04T08:13:10.507Z",
-      "scopes":[
-         {
-            "id":79,
-            "active":false,
-            "environment_scope":"*",
-            "strategies":[
-               {
-                  "name":"default",
-                  "parameters":{
-
-                  }
-               }
-            ],
-            "created_at":"2019-11-04T08:13:10.516Z",
-            "updated_at":"2019-11-04T08:13:10.516Z"
-         },
-         {
-            "id":80,
-            "active":true,
-            "environment_scope":"staging",
-            "strategies":[
-               {
-                  "name":"default",
-                  "parameters":{
-
-                  }
-               }
-            ],
-            "created_at":"2019-11-04T08:13:10.525Z",
-            "updated_at":"2019-11-04T08:13:10.525Z"
-         },
-         {
-            "id":81,
-            "active":false,
-            "environment_scope":"production",
-            "strategies":[
-               {
-                  "name":"default",
-                  "parameters":{
-
-                  }
-               }
-            ],
-            "created_at":"2019-11-04T08:13:10.527Z",
-            "updated_at":"2019-11-04T08:13:10.527Z"
-         }
+      "scopes":[]
+      "strategies": [
+        {
+          "id": 2,
+          "name": "default",
+          "parameters": {},
+          "scopes": [
+            {
+              "id": 2,
+              "environment_scope": "staging"
+            }
+          ]
+        }
       ]
    }
 ]
 ```
 
-## New feature flag
+## Get a single feature flag
+
+Gets a single feature flag.
+
+```plaintext
+GET /projects/:id/feature_flags/:name
+```
+
+| Attribute           | Type             | Required   | Description                                                                            |
+| ------------------- | ---------------- | ---------- | ---------------------------------------------------------------------------------------|
+| `id`                | integer/string   | yes        | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding).       |
+| `name`              | string           | yes        | The name of the feature flag.                                                          |
+
+```shell
+curl --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.example.com/api/v4/projects/1/feature_flags/awesome_feature
+```
+
+Example response:
+
+```json
+{
+  "name": "awesome_feature",
+  "description": null,
+  "version": "new_version_flag",
+  "created_at": "2020-05-13T19:56:33.119Z",
+  "updated_at": "2020-05-13T19:56:33.119Z",
+  "scopes": [],
+  "strategies": [
+    {
+      "id": 36,
+      "name": "default",
+      "parameters": {},
+      "scopes": [
+        {
+          "id": 37,
+          "environment_scope": "production"
+        }
+      ]
+    }
+  ]
+}
+```
+
+## Create a feature flag
 
 Creates a new feature flag.
 
@@ -152,12 +136,14 @@ POST /projects/:id/feature_flags
 | Attribute           | Type             | Required   | Description                                                                            |
 | ------------------- | ---------------- | ---------- | ---------------------------------------------------------------------------------------|
 | `id`                | integer/string   | yes        | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding).       |
-| `name`              | string           | yes        | The name of the feature flag. |
-| `description`       | string           | no         | The description of the feature flag. |
-| `scopes`            | JSON             | no         | The [feature flag specs](../user/project/operations/feature_flags.md#define-environment-specs) of the feature flag. |
-| `scopes:environment_scope` | string           | no         | The [environment spec](../ci/environments/index.md#scoping-environments-with-specs). |
-| `scopes:active`            | boolean          | no         | Whether the spec is active. |
-| `scopes:strategies`        | JSON             | no         | The [strategies](../user/project/operations/feature_flags.md#feature-flag-strategies) of the feature flag spec. |
+| `name`              | string           | yes        | The name of the feature flag.                                                          |
+| `version`           | string           | yes        | The version of the feature flag. Must be `new_version_flag`. Omit or set to `legacy_flag` to create a [Legacy Feature Flag](feature_flags_legacy.md). |
+| `description`       | string           | no         | The description of the feature flag.                                                   |
+| `strategies`        | JSON             | no         | The feature flag [strategies](../user/project/operations/feature_flags.md#feature-flag-strategies). |
+| `strategies:name`   | JSON             | no         | The strategy name.                                                                     |
+| `strategies:parameters` | JSON         | no         | The strategy parameters.                                                               |
+| `strategies:scopes` | JSON             | no         | The scopes for the strategy.                                                           |
+| `strategies:scopes:environment_scope` | string | no | The environment spec for the scope.                                                    |
 
 ```shell
 curl https://gitlab.example.com/api/v4/projects/1/feature_flags \
@@ -165,9 +151,9 @@ curl https://gitlab.example.com/api/v4/projects/1/feature_flags \
      --header "Content-type: application/json" \
      --data @- << EOF
 {
-    "name": "awesome_feature",
-    "scopes": [{ "environment_scope": "*", "active": false, "strategies": [{ "name": "default", "parameters": {} }] },
-               { "environment_scope": "production", "active": true, "strategies": [{ "name": "userWithId", "parameters": { "userIds": "1,2,3" } }] }]
+  "name": "awesome_feature",
+  "version": "new_version_flag",
+  "strategies": [{ "name": "default", "parameters": {}, "scopes": [{ "environment_scope": "production" }] }]
 }
 EOF
 ```
@@ -176,121 +162,101 @@ Example response:
 
 ```json
 {
-   "name":"awesome_feature",
-   "description":null,
-   "created_at":"2019-11-04T08:32:27.288Z",
-   "updated_at":"2019-11-04T08:32:27.288Z",
-   "scopes":[
-      {
-         "id":85,
-         "active":false,
-         "environment_scope":"*",
-         "strategies":[
-            {
-               "name":"default",
-               "parameters":{
-
-               }
-            }
-         ],
-         "created_at":"2019-11-04T08:32:29.324Z",
-         "updated_at":"2019-11-04T08:32:29.324Z"
-      },
-      {
-         "id":86,
-         "active":true,
-         "environment_scope":"production",
-         "strategies":[
-            {
-               "name":"userWithId",
-               "parameters":{
-                  "userIds":"1,2,3"
-               }
-            }
-         ],
-         "created_at":"2019-11-04T08:32:29.328Z",
-         "updated_at":"2019-11-04T08:32:29.328Z"
-      }
-   ]
+  "name": "awesome_feature",
+  "description": null,
+  "version": "new_version_flag",
+  "created_at": "2020-05-13T19:56:33.119Z",
+  "updated_at": "2020-05-13T19:56:33.119Z",
+  "scopes": [],
+  "strategies": [
+    {
+      "id": 36,
+      "name": "default",
+      "parameters": {},
+      "scopes": [
+        {
+          "id": 37,
+          "environment_scope": "production"
+        }
+      ]
+    }
+  ]
 }
 ```
 
-## Single feature flag
+## Update a feature flag
 
-Gets a single feature flag.
+Updates a feature flag.
 
 ```plaintext
-GET /projects/:id/feature_flags/:name
+PUT /projects/:id/feature_flags/:name
 ```
 
 | Attribute           | Type             | Required   | Description                                                                            |
 | ------------------- | ---------------- | ---------- | ---------------------------------------------------------------------------------------|
 | `id`                | integer/string   | yes        | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding).       |
-| `name`              | string           | yes        | The name of the feature flag.  |
+| `name`              | string           | yes        | The name of the feature flag.                                                          |
+| `description`       | string           | no         | The description of the feature flag.                                                   |
+| `strategies`        | JSON             | no         | The feature flag [strategies](../user/project/operations/feature_flags.md#feature-flag-strategies). |
+| `strategies:id`     | JSON             | no         | The feature flag strategy id.                                                          |
+| `strategies:name`   | JSON             | no         | The strategy name.                                                                     |
+| `strategies:parameters` | JSON         | no         | The strategy parameters.                                                               |
+| `strategies:scopes` | JSON             | no         | The scopes for the strategy.                                                           |
+| `strategies:scopes:id` | JSON          | no         | The scopes id.                                                                         |
+| `strategies:scopes:environment_scope` | string | no | The environment spec for the scope.                                                    |
 
 ```shell
-curl --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.example.com/api/v4/projects/1/feature_flags/new_live_trace
+curl https://gitlab.example.com/api/v4/projects/1/feature_flags/awesome_feature \
+     --header "PRIVATE-TOKEN: <your_access_token>" \
+     --header "Content-type: application/json" \
+     --data @- << EOF
+{
+  "strategies": [{ "name": "gradualRolloutUserId", "parameters": { "groupId": "default", "percentage": "25" }, "scopes": [{ "environment_scope": "staging" }] }]
+}
+EOF
 ```
 
 Example response:
 
 ```json
 {
-   "name":"new_live_trace",
-   "description":"This is a new live trace feature",
-   "created_at":"2019-11-04T08:13:10.507Z",
-   "updated_at":"2019-11-04T08:13:10.507Z",
-   "scopes":[
-      {
-         "id":79,
-         "active":false,
-         "environment_scope":"*",
-         "strategies":[
-            {
-               "name":"default",
-               "parameters":{
-
-               }
-            }
-         ],
-         "created_at":"2019-11-04T08:13:10.516Z",
-         "updated_at":"2019-11-04T08:13:10.516Z"
+  "name": "awesome_feature",
+  "description": null,
+  "version": "new_version_flag",
+  "created_at": "2020-05-13T20:10:32.891Z",
+  "updated_at": "2020-05-13T20:10:32.891Z",
+  "scopes": [],
+  "strategies": [
+    {
+      "id": 38,
+      "name": "gradualRolloutUserId",
+      "parameters": {
+        "groupId": "default",
+        "percentage": "25"
       },
-      {
-         "id":80,
-         "active":true,
-         "environment_scope":"staging",
-         "strategies":[
-            {
-               "name":"default",
-               "parameters":{
-
-               }
-            }
-         ],
-         "created_at":"2019-11-04T08:13:10.525Z",
-         "updated_at":"2019-11-04T08:13:10.525Z"
-      },
-      {
-         "id":81,
-         "active":false,
-         "environment_scope":"production",
-         "strategies":[
-            {
-               "name":"default",
-               "parameters":{
-
-               }
-            }
-         ],
-         "created_at":"2019-11-04T08:13:10.527Z",
-         "updated_at":"2019-11-04T08:13:10.527Z"
-      }
-   ]
+      "scopes": [
+        {
+          "id": 40,
+          "environment_scope": "staging"
+        }
+      ]
+    },
+    {
+      "id": 37,
+      "name": "default",
+      "parameters": {},
+      "scopes": [
+        {
+          "id": 39,
+          "environment_scope": "production"
+        }
+      ]
+    }
+  ]
 }
 ```
 
-## Delete feature flag
+## Delete a feature flag
 
 Deletes a feature flag.
 
diff --git a/doc/api/feature_flags_legacy.md b/doc/api/feature_flags_legacy.md
new file mode 100644
index 00000000000..82af43e89f0
--- /dev/null
+++ b/doc/api/feature_flags_legacy.md
@@ -0,0 +1,311 @@
+# Legacy Feature Flags API **(PREMIUM)**
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/9566) in [GitLab Premium](https://about.gitlab.com/pricing/) 12.5.
+
+CAUTION: **Deprecation**
+This API is deprecated and [scheduled for removal in GitLab 14.0](https://gitlab.com/gitlab-org/gitlab/-/issues/213369). Use [this API](feature_flags.md) instead.
+
+API for accessing resources of [GitLab Feature Flags](../user/project/operations/feature_flags.md).
+
+Users with Developer or higher [permissions](../user/permissions.md) can access Feature Flag API.
+
+## Feature Flags pagination
+
+By default, `GET` requests return 20 results at a time because the API results
+are [paginated](README.md#pagination).
+
+## List feature flags for a project
+
+Gets all feature flags of the requested project.
+
+```plaintext
+GET /projects/:id/feature_flags
+```
+
+| Attribute           | Type             | Required   | Description                                                                                                                 |
+| ------------------- | ---------------- | ---------- | --------------------------------------------------------------------------------------------------------------------------- |
+| `id`                | integer/string   | yes        | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding).                                            |
+| `scope`             | string           | no         | The condition of feature flags, one of: `enabled`, `disabled`.                                                              |
+
+```shell
+curl --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.example.com/api/v4/projects/1/feature_flags
+```
+
+Example response:
+
+```json
+[
+   {
+      "name":"merge_train",
+      "description":"This feature is about merge train",
+      "created_at":"2019-11-04T08:13:51.423Z",
+      "updated_at":"2019-11-04T08:13:51.423Z",
+      "scopes":[
+         {
+            "id":82,
+            "active":false,
+            "environment_scope":"*",
+            "strategies":[
+               {
+                  "name":"default",
+                  "parameters":{
+
+                  }
+               }
+            ],
+            "created_at":"2019-11-04T08:13:51.425Z",
+            "updated_at":"2019-11-04T08:13:51.425Z"
+         },
+         {
+            "id":83,
+            "active":true,
+            "environment_scope":"review/*",
+            "strategies":[
+               {
+                  "name":"default",
+                  "parameters":{
+
+                  }
+               }
+            ],
+            "created_at":"2019-11-04T08:13:51.427Z",
+            "updated_at":"2019-11-04T08:13:51.427Z"
+         },
+         {
+            "id":84,
+            "active":false,
+            "environment_scope":"production",
+            "strategies":[
+               {
+                  "name":"default",
+                  "parameters":{
+
+                  }
+               }
+            ],
+            "created_at":"2019-11-04T08:13:51.428Z",
+            "updated_at":"2019-11-04T08:13:51.428Z"
+         }
+      ]
+   },
+   {
+      "name":"new_live_trace",
+      "description":"This is a new live trace feature",
+      "created_at":"2019-11-04T08:13:10.507Z",
+      "updated_at":"2019-11-04T08:13:10.507Z",
+      "scopes":[
+         {
+            "id":79,
+            "active":false,
+            "environment_scope":"*",
+            "strategies":[
+               {
+                  "name":"default",
+                  "parameters":{
+
+                  }
+               }
+            ],
+            "created_at":"2019-11-04T08:13:10.516Z",
+            "updated_at":"2019-11-04T08:13:10.516Z"
+         },
+         {
+            "id":80,
+            "active":true,
+            "environment_scope":"staging",
+            "strategies":[
+               {
+                  "name":"default",
+                  "parameters":{
+
+                  }
+               }
+            ],
+            "created_at":"2019-11-04T08:13:10.525Z",
+            "updated_at":"2019-11-04T08:13:10.525Z"
+         },
+         {
+            "id":81,
+            "active":false,
+            "environment_scope":"production",
+            "strategies":[
+               {
+                  "name":"default",
+                  "parameters":{
+
+                  }
+               }
+            ],
+            "created_at":"2019-11-04T08:13:10.527Z",
+            "updated_at":"2019-11-04T08:13:10.527Z"
+         }
+      ]
+   }
+]
+```
+
+## New feature flag
+
+Creates a new feature flag.
+
+```plaintext
+POST /projects/:id/feature_flags
+```
+
+| Attribute           | Type             | Required   | Description                                                                            |
+| ------------------- | ---------------- | ---------- | ---------------------------------------------------------------------------------------|
+| `id`                | integer/string   | yes        | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding).       |
+| `name`              | string           | yes        | The name of the feature flag.                                                          |
+| `description`       | string           | no         | The description of the feature flag.                                                   |
+| `scopes`            | JSON             | no         | The feature flag specs of the feature flag.                                            |
+| `scopes:environment_scope` | string    | no         | The environment spec.                                                                  |
+| `scopes:active`     | boolean          | no         | Whether the spec is active.                                                            |
+| `scopes:strategies` | JSON             | no         | The [strategies](../user/project/operations/feature_flags.md#feature-flag-strategies) of the feature flag spec. |
+
+```shell
+curl https://gitlab.example.com/api/v4/projects/1/feature_flags \
+     --header "PRIVATE-TOKEN: <your_access_token>" \
+     --header "Content-type: application/json" \
+     --data @- << EOF
+{
+    "name": "awesome_feature",
+    "scopes": [{ "environment_scope": "*", "active": false, "strategies": [{ "name": "default", "parameters": {} }] },
+               { "environment_scope": "production", "active": true, "strategies": [{ "name": "userWithId", "parameters": { "userIds": "1,2,3" } }] }]
+}
+EOF
+```
+
+Example response:
+
+```json
+{
+   "name":"awesome_feature",
+   "description":null,
+   "created_at":"2019-11-04T08:32:27.288Z",
+   "updated_at":"2019-11-04T08:32:27.288Z",
+   "scopes":[
+      {
+         "id":85,
+         "active":false,
+         "environment_scope":"*",
+         "strategies":[
+            {
+               "name":"default",
+               "parameters":{
+
+               }
+            }
+         ],
+         "created_at":"2019-11-04T08:32:29.324Z",
+         "updated_at":"2019-11-04T08:32:29.324Z"
+      },
+      {
+         "id":86,
+         "active":true,
+         "environment_scope":"production",
+         "strategies":[
+            {
+               "name":"userWithId",
+               "parameters":{
+                  "userIds":"1,2,3"
+               }
+            }
+         ],
+         "created_at":"2019-11-04T08:32:29.328Z",
+         "updated_at":"2019-11-04T08:32:29.328Z"
+      }
+   ]
+}
+```
+
+## Single feature flag
+
+Gets a single feature flag.
+
+```plaintext
+GET /projects/:id/feature_flags/:name
+```
+
+| Attribute           | Type             | Required   | Description                                                                            |
+| ------------------- | ---------------- | ---------- | ---------------------------------------------------------------------------------------|
+| `id`                | integer/string   | yes        | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding).       |
+| `name`              | string           | yes        | The name of the feature flag.  |
+
+```shell
+curl --header "PRIVATE-TOKEN: <your_access_token>" https://gitlab.example.com/api/v4/projects/1/feature_flags/new_live_trace
+```
+
+Example response:
+
+```json
+{
+   "name":"new_live_trace",
+   "description":"This is a new live trace feature",
+   "created_at":"2019-11-04T08:13:10.507Z",
+   "updated_at":"2019-11-04T08:13:10.507Z",
+   "scopes":[
+      {
+         "id":79,
+         "active":false,
+         "environment_scope":"*",
+         "strategies":[
+            {
+               "name":"default",
+               "parameters":{
+
+               }
+            }
+         ],
+         "created_at":"2019-11-04T08:13:10.516Z",
+         "updated_at":"2019-11-04T08:13:10.516Z"
+      },
+      {
+         "id":80,
+         "active":true,
+         "environment_scope":"staging",
+         "strategies":[
+            {
+               "name":"default",
+               "parameters":{
+
+               }
+            }
+         ],
+         "created_at":"2019-11-04T08:13:10.525Z",
+         "updated_at":"2019-11-04T08:13:10.525Z"
+      },
+      {
+         "id":81,
+         "active":false,
+         "environment_scope":"production",
+         "strategies":[
+            {
+               "name":"default",
+               "parameters":{
+
+               }
+            }
+         ],
+         "created_at":"2019-11-04T08:13:10.527Z",
+         "updated_at":"2019-11-04T08:13:10.527Z"
+      }
+   ]
+}
+```
+
+## Delete feature flag
+
+Deletes a feature flag.
+
+```plaintext
+DELETE /projects/:id/feature_flags/:name
+```
+
+| Attribute           | Type             | Required   | Description                                                                            |
+| ------------------- | ---------------- | ---------- | ---------------------------------------------------------------------------------------|
+| `id`                | integer/string   | yes        | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding).       |
+| `name`              | string           | yes        | The name of the feature flag.  |
+
+```shell
+curl --header "PRIVATE-TOKEN: <your_access_token>" --request DELETE https://gitlab.example.com/api/v4/projects/1/feature_flags/awesome_feature
+```
diff --git a/doc/integration/img/ultra_auth_credentials.png b/doc/integration/img/ultra_auth_credentials.png
deleted file mode 100644
index cff98a4b056..00000000000
--- a/doc/integration/img/ultra_auth_credentials.png
+++ /dev/null
diff --git a/doc/integration/img/ultra_auth_edit_callback_url.png b/doc/integration/img/ultra_auth_edit_callback_url.png
deleted file mode 100644
index b7548122c5e..00000000000
--- a/doc/integration/img/ultra_auth_edit_callback_url.png
+++ /dev/null
diff --git a/doc/integration/img/ultra_auth_edit_callback_url_highlighted.png b/doc/integration/img/ultra_auth_edit_callback_url_highlighted.png
deleted file mode 100644
index 4abf224756c..00000000000
--- a/doc/integration/img/ultra_auth_edit_callback_url_highlighted.png
+++ /dev/null
diff --git a/doc/integration/omniauth.md b/doc/integration/omniauth.md
index 2afdeccb764..2ace05a8320 100644
--- a/doc/integration/omniauth.md
+++ b/doc/integration/omniauth.md
@@ -34,7 +34,6 @@ contains some settings that are common for all providers.
 - [OAuth2Generic](oauth2_generic.md)
 - [JWT](../administration/auth/jwt.md)
 - [OpenID Connect](../administration/auth/oidc.md)
-- [UltraAuth](ultra_auth.md)
 - [Salesforce](salesforce.md)
 - [AWS Cognito](../administration/auth/cognito.md)
 
diff --git a/doc/integration/ultra_auth.md b/doc/integration/ultra_auth.md
deleted file mode 100644
index 95f2c0feb3b..00000000000
--- a/doc/integration/ultra_auth.md
+++ /dev/null
@@ -1,87 +0,0 @@
-# UltraAuth OmniAuth Provider
-
-You can integrate your GitLab instance with [UltraAuth](https://github.com/ultraauth) to enable users to perform secure biometric authentication to your GitLab instance with your UltraAuth account. Users have to perform the biometric authentication using their mobile device with fingerprint sensor.
-
-## Create UltraAuth Application
-
-To enable UltraAuth OmniAuth provider, you must use UltraAuth's credentials for your GitLab instance.
-To get the credentials (a pair of Client ID and Client Secret), you must register an application on UltraAuth.
-
-1. Sign in to [UltraAuth](https://app.ultraauth.com).
-1. Navigate to **Create an App** and click on **Ruby on Rails**.
-1. Scroll down the page that is displayed to locate the **Client ID** and **Client Secret**.
-   Keep this page open as you continue configuration.
-
-   ![UltraAuth Credentials: OPENID_CLIENT_ID and OPENID_CLIENT_SECRET](img/ultra_auth_credentials.png)
-
-1. Click on "Edit Callback URL" link.
-
-   ![Edit UltraAuth Callback URL](img/ultra_auth_edit_callback_url_highlighted.png)
-
-1. The callback URL will be `http(s)://<your_domain>/users/auth/ultraauth/callback`
-
-   ![UltraAuth Callback URL](img/ultra_auth_edit_callback_url.png)
-
-1. Select **Register application**.
-1. On your GitLab server, open the configuration file.
-
-   For Omnibus package:
-
-   ```shell
-   sudo editor /etc/gitlab/gitlab.rb
-   ```
-
-   For installations from source:
-
-   ```shell
-   cd /home/git/gitlab
-   sudo -u git -H editor config/gitlab.yml
-   ```
-
-1. See [Initial OmniAuth Configuration](omniauth.md#initial-omniauth-configuration) for initial settings.
-1. Add the provider configuration:
-
-   For Omnibus package:
-
-   ```ruby
-   gitlab_rails['omniauth_providers'] = [
-     {
-       "name" => "ultraauth",
-       "app_id" => "OPENID_CLIENT_ID",
-       "app_secret" => "OPENID_CLIENT_SECRET",
-       "args" => {
-         "client_options" => {
-           "redirect_uri" => "https://example.com/users/auth/ultraauth/callback"
-         }
-       }
-     }
-   ]
-   ```
-
-   For installation from source:
-
-   ```yaml
-   - { name: 'ultraauth',
-       app_id: 'OPENID_CLIENT_ID',
-       app_secret: 'OPENID_CLIENT_SECRET',
-       args: {
-         client_options: {
-           redirect_uri: 'https://example.com/users/auth/ultraauth/callback'
-         }
-       }
-     }
-   ```
-
-   __Replace `https://example.com/users/auth/ultraauth/callback` with your application's Callback URL.__
-
-1. Change `OPENID_CLIENT_ID` to the Client ID from the UltraAuth application page.
-1. Change `OPENID_CLIENT_SECRET` to the Client Secret from the UltraAuth application page.
-1. Save the configuration file.
-1. [Reconfigure GitLab](../administration/restart_gitlab.md#omnibus-gitlab-reconfigure) or [restart GitLab](../administration/restart_gitlab.md#installations-from-source) for the changes to take effect if you
-   installed GitLab via Omnibus or from source respectively.
-
-On the sign in page, there should now be an UltraAuth icon below the regular sign in form.
-Click the icon to begin the authentication process. UltraAuth will ask the user to sign in and authorize the GitLab application.
-If everything goes well, the user will be returned to GitLab and will be signed in.
-
-GitLab requires the email address of each new user. Once the user is logged in using UltraAuth, GitLab will redirect the user to the profile page where they will have to provide the email and verify the email. Password authentication will be disabled for UltraAuth users and two-factor authentication (2FA) will be enforced.
diff --git a/doc/user/application_security/dast/index.md b/doc/user/application_security/dast/index.md
index 7bcf52efb1a..e057f03f39a 100644
--- a/doc/user/application_security/dast/index.md
+++ b/doc/user/application_security/dast/index.md
@@ -456,7 +456,7 @@ DAST can be [configured](#customizing-the-dast-settings) using environment varia
 | `DAST_FULL_SCAN_DOMAIN_VALIDATION_REQUIRED` | no | Requires [domain validation](#domain-validation) when running DAST full scans. Boolean. `true`, `True`, or `1` are considered as true value, otherwise false. Defaults to `false`. Not supported for API scans. |
 | `DAST_AUTO_UPDATE_ADDONS` | no | By default the versions of ZAP add-ons are pinned to those provided with the DAST image. Set to `true` to allow ZAP to download the latest versions. |
 | `DAST_API_HOST_OVERRIDE` | no | Used to override domains defined in API specification files. |
-| `DAST_EXCLUDE_RULES` | no | Set to a comma-separated list of Vulnerability Rule IDs to exclude them from scans. Rule IDs are numbers and can be found from the DAST log or on the [ZAP project](https://github.com/zaproxy/zaproxy/blob/master/docs/scanners.md). For example, `HTTP Parameter Override` has a rule ID of `10026`. |
+| `DAST_EXCLUDE_RULES` | no | Set to a comma-separated list of Vulnerability Rule IDs to exclude them from the scan report. Currently, excluded rules will get executed but the alerts from them will be suppressed. Rule IDs are numbers and can be found from the DAST log or on the [ZAP project](https://github.com/zaproxy/zaproxy/blob/develop/docs/scanners.md). For example, `HTTP Parameter Override` has a rule ID of `10026`. |
 | `DAST_REQUEST_HEADERS` | no | Set to a comma-separated list of request header names and values. For example, `Cache-control: no-cache,User-Agent: DAST/1.0` |
 | `DAST_ZAP_USE_AJAX_SPIDER` | no | Use the AJAX spider in addition to the traditional spider, useful for crawling sites that require JavaScript. Boolean. `true`, `True`, or `1` are considered as true value, otherwise false. Defaults to `false`. |
 
diff --git a/doc/user/project/operations/feature_flags.md b/doc/user/project/operations/feature_flags.md
index fb76fb1ac59..2ec2c97c707 100644
--- a/doc/user/project/operations/feature_flags.md
+++ b/doc/user/project/operations/feature_flags.md
@@ -311,6 +311,6 @@ end
 You can create, update, read, and delete Feature Flags via API
 to control them in an automated flow:
 
-- [Feature Flags API](../../../api/feature_flags.md)
+- [Legacy Feature Flags API](../../../api/feature_flags_legacy.md)
 - [Feature Flag Specs API](../../../api/feature_flag_specs.md)
 - [Feature Flag User Lists API](../../../api/feature_flag_user_lists.md)