Add latest changes from gitlab-org/gitlab@master

3 files changed, 14 insertions, 17 deletions

diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index eab921a1de6..63781f9f353 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -14601,8 +14601,8 @@ Alert status values.
 | Value | Description |
 | ----- | ----------- |
 | <a id="alertmanagementstatusacknowledged"></a>`ACKNOWLEDGED` | Someone is actively investigating the problem. |
-| <a id="alertmanagementstatusignored"></a>`IGNORED` | No action will be taken on the alert. |
-| <a id="alertmanagementstatusresolved"></a>`RESOLVED` | No further work is required. |
+| <a id="alertmanagementstatusignored"></a>`IGNORED` | No action will be taken. |
+| <a id="alertmanagementstatusresolved"></a>`RESOLVED` | The problem has been addressed. |
 | <a id="alertmanagementstatustriggered"></a>`TRIGGERED` | Investigation has not started. |
 
 ### `ApiFuzzingScanMode`
diff --git a/doc/development/testing_guide/end_to_end/environment_selection.md b/doc/development/testing_guide/end_to_end/environment_selection.md
deleted file mode 100644
index e03966d754b..00000000000
--- a/doc/development/testing_guide/end_to_end/environment_selection.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-redirect_to: 'execution_context_selection.md'
-remove_date: '2021-08-14'
----
-
-This file was moved to [another location](execution_context_selection.md).
-
-<!-- This redirect file can be deleted after <2021-08-14>. -->
-<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/#move-or-rename-a-page -->
diff --git a/doc/integration/oauth_provider.md b/doc/integration/oauth_provider.md
index 7540a02e520..596fff47716 100644
--- a/doc/integration/oauth_provider.md
+++ b/doc/integration/oauth_provider.md
@@ -51,10 +51,13 @@ To add a new application for your user:
 1. In the left sidebar, select **Applications**.
 1. Enter a **Name**, **Redirect URI** and OAuth 2 scopes as defined in [Authorized Applications](#authorized-applications).
    The **Redirect URI** is the URL where users are sent after they authorize with GitLab.
-1. Select **Save application**. GitLab displays:
+1. Select **Save application**. GitLab provides:
 
-   - Application ID: OAuth 2 Client ID.
-   - Secret: OAuth 2 Client Secret.
+   - The OAuth 2 Client ID in the **Application ID** field.
+   - The OAuth 2 Client Secret, accessible:
+     - In the **Secret** field in GitLab 14.1 and earlier.
+     - Using the **Copy** button on the **Secret** field
+       [in GitLab 14.2 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/332844).
 
 ## Group owned applications
 
@@ -66,10 +69,13 @@ To add a new application for a group:
 1. On the left sidebar, select **Settings > Applications**.
 1. Enter a **Name**, **Redirect URI** and OAuth 2 scopes as defined in [Authorized Applications](#authorized-applications).
    The **Redirect URI** is the URL where users are sent after they authorize with GitLab.
-1. Select **Save application**. GitLab displays:
+1. Select **Save application**. GitLab provides:
 
-   - Application ID: OAuth 2 Client ID.
-   - Secret: OAuth 2 Client Secret.
+   - The OAuth 2 Client ID in the **Application ID** field.
+   - The OAuth 2 Client Secret, accessible:
+     - In the **Secret** field in GitLab 14.1 and earlier.
+     - Using the **Copy** button on the **Secret** field
+       [in GitLab 14.2 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/332844).
 
 ## Instance-wide applications