Add latest changes from gitlab-org/gitlab@master

15 files changed, 52 insertions, 22 deletions

diff --git a/doc/integration/alicloud.md b/doc/integration/alicloud.md
index 263b3837d1d..d861d32e96a 100644
--- a/doc/integration/alicloud.md
+++ b/doc/integration/alicloud.md
@@ -59,7 +59,9 @@ Sign in to the AliCloud platform and create an application on it. AliCloud gener
      sudo -u git -H editor config/gitlab.yml
      ```
 
-1. [Configure the initial settings](omniauth.md#configure-initial-settings).
+1. Edit the [common configuration file settings](omniauth.md#configure-common-settings)
+   to add `alicloud` as a single sign-on provider. This enables Just-In-Time
+   account provisioning for users who do not have an existing GitLab account.
 
 1. Add the provider configuration. Replace `YOUR_APP_ID` with the ID on the application details page
    and `YOUR_APP_SECRET` with the **SecretValue** you got when you registered the AliCloud application.
diff --git a/doc/integration/auth0.md b/doc/integration/auth0.md
index 448807e91fc..ad20057f452 100644
--- a/doc/integration/auth0.md
+++ b/doc/integration/auth0.md
@@ -42,8 +42,9 @@ application.
    sudo -u git -H editor config/gitlab.yml
    ```
 
-1. Read [Configure initial settings](omniauth.md#configure-initial-settings)
-   for initial settings.
+1. Edit the [common configuration file settings](omniauth.md#configure-common-settings)
+   to add `auth0` as a single sign-on provider. This enables Just-In-Time
+   account provisioning for users who do not have an existing GitLab account.
 
 1. Add the provider configuration:
 
diff --git a/doc/integration/azure.md b/doc/integration/azure.md
index 8c30a0cef77..cc479dbf65d 100644
--- a/doc/integration/azure.md
+++ b/doc/integration/azure.md
@@ -68,7 +68,9 @@ Alternatively, add the `User.Read.All` application permission.
      sudo -u git -H editor config/gitlab.yml
      ```
 
-1. [Configure the initial settings](omniauth.md#configure-initial-settings).
+1. Edit the [common configuration file settings](omniauth.md#configure-common-settings)
+   to add `azure_oauth2` as a single sign-on provider. This enables Just-In-Time
+   account provisioning for users who do not have an existing GitLab account.
 
 1. Add the provider configuration. Replace `<client_id>`, `<client_secret>`, and `<tenant_id>`
    with the values you got when you registered the Azure application.
diff --git a/doc/integration/cas.md b/doc/integration/cas.md
index 35c5a6db4a7..750c9aeb8a4 100644
--- a/doc/integration/cas.md
+++ b/doc/integration/cas.md
@@ -32,7 +32,9 @@ configure CAS for back-channel logout.
    sudo -u git -H editor config/gitlab.yml
    ```
 
-1. See [Configure initial settings](omniauth.md#configure-initial-settings) for initial settings.
+1. Edit the [common configuration file settings](omniauth.md#configure-common-settings)
+   to add `cas3` as a single sign-on provider. This enables Just-In-Time
+   account provisioning for users who do not have an existing GitLab account.
 
 1. Add the provider configuration:
 
diff --git a/doc/integration/ding_talk.md b/doc/integration/ding_talk.md
index 18423fa1607..ca939dc9f9a 100644
--- a/doc/integration/ding_talk.md
+++ b/doc/integration/ding_talk.md
@@ -51,7 +51,9 @@ Sign in to DingTalk Open Platform and create an application on it. DingTalk gene
    sudo -u git -H editor config/gitlab.yml
    ```
 
-1. See [Configure initial settings](omniauth.md#configure-initial-settings) for initial settings.
+1. Edit the [common configuration file settings](omniauth.md#configure-common-settings)
+   to add `dingtalk` as a single sign-on provider. This enables Just-In-Time
+   account provisioning for users who do not have an existing GitLab account.
 
 1. Add the provider configuration:
 
diff --git a/doc/integration/facebook.md b/doc/integration/facebook.md
index 7c6afffc847..8b7bdeaa177 100644
--- a/doc/integration/facebook.md
+++ b/doc/integration/facebook.md
@@ -72,7 +72,9 @@ Facebook. Facebook generates an app ID and secret key for you to use.
    sudo -u git -H editor config/gitlab.yml
    ```
 
-1. See [Configure initial settings](omniauth.md#configure-initial-settings) for initial settings.
+1. Edit the [common configuration file settings](omniauth.md#configure-common-settings)
+   to add `facebook` as a single sign-on provider. This enables Just-In-Time
+   account provisioning for users who do not have an existing GitLab account.
 
 1. Add the provider configuration:
 
diff --git a/doc/integration/github.md b/doc/integration/github.md
index 6b59128966a..8f60e1b5d71 100644
--- a/doc/integration/github.md
+++ b/doc/integration/github.md
@@ -35,7 +35,9 @@ your website could enable the covert redirect attack.
 
 ## Enable GitHub OAuth in GitLab
 
-1. [Configure the initial settings](omniauth.md#configure-initial-settings) in GitLab.
+1. Edit the [common configuration file settings](omniauth.md#configure-common-settings)
+   to add `github` as a single sign-on provider. This enables Just-In-Time
+   account provisioning for users who do not have an existing GitLab account.
 
 1. Edit the GitLab configuration file using the following information:
 
diff --git a/doc/integration/gitlab.md b/doc/integration/gitlab.md
index 0ee5b70c958..44dba2b1829 100644
--- a/doc/integration/gitlab.md
+++ b/doc/integration/gitlab.md
@@ -51,7 +51,9 @@ GitLab.com generates an application ID and secret key for you to use.
    sudo -u git -H editor config/gitlab.yml
    ```
 
-1. See [Configure initial settings](omniauth.md#configure-initial-settings) for initial settings.
+1. Edit the [common configuration file settings](omniauth.md#configure-common-settings)
+   to add `gitlab` as a single sign-on provider. This enables Just-In-Time
+   account provisioning for users who do not have an existing GitLab account.
 1. Add the provider configuration:
 
    For Omnibus installations authenticating against **GitLab.com**:
diff --git a/doc/integration/google.md b/doc/integration/google.md
index 947bf0303be..5eac639f119 100644
--- a/doc/integration/google.md
+++ b/doc/integration/google.md
@@ -71,7 +71,9 @@ On your GitLab server:
    sudo -u git -H editor config/gitlab.yml
    ```
 
-1. See [Configure initial settings](omniauth.md#configure-initial-settings) for initial settings.
+1. Edit the [common configuration file settings](omniauth.md#configure-common-settings)
+   to add `google_oauth2` as a single sign-on provider. This enables Just-In-Time
+   account provisioning for users who do not have an existing GitLab account.
 1. Add the provider configuration:
 
    For Omnibus GitLab:
diff --git a/doc/integration/kerberos.md b/doc/integration/kerberos.md
index 2125aea892b..a518349b1ad 100644
--- a/doc/integration/kerberos.md
+++ b/doc/integration/kerberos.md
@@ -99,9 +99,9 @@ to authenticate with Kerberos tokens.
 
 #### Enable single sign-on
 
-See [Configure initial settings](omniauth.md#configure-initial-settings)
-for initial settings to enable single sign-on and add Kerberos servers
-as an identity provider.
+Edit the [common configuration file settings](omniauth.md#configure-common-settings)
+to add `kerberos` as a single sign-on provider. This enables Just-In-Time
+account provisioning for users who do not have an existing GitLab account.
 
 ## Create and link Kerberos accounts
 
@@ -138,7 +138,8 @@ with your Kerberos credentials.
 
 The first time users sign in to GitLab with their Kerberos accounts,
 GitLab creates a matching account.
-Before you continue, review the [Configure initial settings](omniauth.md#configure-initial-settings) options in Omnibus and GitLab source. You must also include `kerberos`.
+Before you continue, review the [common configuration settings](omniauth.md#configure-common-settings)
+options in Omnibus and GitLab source. You must also include `kerberos`.
 
 With that information at hand:
 
diff --git a/doc/integration/oauth2_generic.md b/doc/integration/oauth2_generic.md
index c51400113d4..2c0439a328c 100644
--- a/doc/integration/oauth2_generic.md
+++ b/doc/integration/oauth2_generic.md
@@ -54,7 +54,9 @@ To configure the provider:
 
    :::TabTitle Linux package (Omnibus)
 
-   1. [Configure the initial settings](omniauth.md#configure-initial-settings).
+   1. Edit the [common configuration file settings](omniauth.md#configure-common-settings)
+      to add `oauth2_generic` as a single sign-on provider. This enables Just-In-Time
+      account provisioning for users who do not have an existing GitLab account.
    1. Edit `/etc/gitlab/gitlab.rb` to add the configuration for your provider. For example:
 
       ```ruby
@@ -96,7 +98,9 @@ To configure the provider:
 
    :::TabTitle Helm chart (Kubernetes)
 
-   1. [Configure the initial settings](omniauth.md#configure-initial-settings).
+   1. Edit the [common configuration file settings](omniauth.md#configure-common-settings)
+      to add `oauth2_generic` as a single sign-on provider. This enables Just-In-Time
+      account provisioning for users who do not have an existing GitLab account.
    1. Export the Helm values:
 
       ```shell
@@ -146,7 +150,9 @@ To configure the provider:
 
    :::TabTitle Self-compiled (source)
 
-   1. [Configure the initial settings](omniauth.md#configure-initial-settings).
+   1. Edit the [common configuration file settings](omniauth.md#configure-common-settings)
+      to add `oauth2_generic` as a single sign-on provider. This enables Just-In-Time
+      account provisioning for users who do not have an existing GitLab account.
    1. Edit `/home/git/gitlab/config/gitlab.yml`:
 
       ```yaml
diff --git a/doc/integration/omniauth.md b/doc/integration/omniauth.md
index 2dd8505b558..07dbe46691b 100644
--- a/doc/integration/omniauth.md
+++ b/doc/integration/omniauth.md
@@ -38,7 +38,7 @@ GitLab supports the following OmniAuth providers.
 | [SAML](saml.md)                                                     | `saml`                     |
 | [Twitter](twitter.md)                                               | `twitter`                  |
 
-## Initial settings
+## Configure common settings
 
 Before you configure the OmniAuth provider,
 configure the settings that are common for all providers.
@@ -503,7 +503,7 @@ There are two methods to update the `extern_uid`:
   Identity.where(extern_uid: 'old-id').update!(extern_uid: 'new-id')`
   ```
 
-## Limitations
+## Known issues
 
 Most supported OmniAuth providers don't support Git over HTTP password authentication.
 As a workaround, you can authenticate using a [personal access token](../user/profile/personal_access_tokens.md).
diff --git a/doc/integration/salesforce.md b/doc/integration/salesforce.md
index d4d2bfacb4f..16432d3ca5d 100644
--- a/doc/integration/salesforce.md
+++ b/doc/integration/salesforce.md
@@ -48,7 +48,9 @@ To get the credentials (a pair of Client ID and Client Secret), you must [create
    sudo -u git -H editor config/gitlab.yml
    ```
 
-1. See [Configure initial settings](omniauth.md#configure-initial-settings) for initial settings.
+1. Edit the [common configuration file settings](omniauth.md#configure-common-settings)
+   to add `salesforce` as a single sign-on provider. This enables Just-In-Time
+   account provisioning for users who do not have an existing GitLab account.
 
 1. Add the provider configuration:
 
diff --git a/doc/integration/saml.md b/doc/integration/saml.md
index a6840b50e27..b210a9b9888 100644
--- a/doc/integration/saml.md
+++ b/doc/integration/saml.md
@@ -41,7 +41,9 @@ For more information on:
    sudo -u git -H editor config/gitlab.yml
    ```
 
-1. Edit the initial [configuration settings](omniauth.md#configure-initial-settings).
+1. Edit the [common configuration file settings](omniauth.md#configure-common-settings)
+   to add `saml` as a single sign-on provider. This enables Just-In-Time
+   account provisioning for users who do not have an existing GitLab account.
 
 1. To allow your users to use SAML to sign up without having to manually create
    an account first, add the following values to your configuration.
diff --git a/doc/integration/twitter.md b/doc/integration/twitter.md
index 90fb63ff40a..f1bfc5a3662 100644
--- a/doc/integration/twitter.md
+++ b/doc/integration/twitter.md
@@ -62,7 +62,9 @@ Twitter. Twitter generates a client ID and secret key for you to use.
      sudo -u git -H editor config/gitlab.yml
    ```
 
-1. See [Configure initial settings](omniauth.md#configure-initial-settings) for initial settings.
+1. Edit the [common configuration file settings](omniauth.md#configure-common-settings)
+   to add `twitter` as a single sign-on provider. This enables Just-In-Time
+   account provisioning for users who do not have an existing GitLab account.
 
 1. Add the provider configuration.