Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42

1 files changed, 15 insertions, 11 deletions

diff --git a/doc/integration/azure.md b/doc/integration/azure.md
index bd16c8c0069..8d69881699b 100644
--- a/doc/integration/azure.md
+++ b/doc/integration/azure.md
@@ -58,11 +58,12 @@ As you go through the Microsoft procedure, keep the following in mind:
    ```ruby
    gitlab_rails['omniauth_providers'] = [
      {
-       "name" => "azure_oauth2",
-       "args" => {
-         "client_id" => "CLIENT ID",
-         "client_secret" => "CLIENT SECRET",
-         "tenant_id" => "TENANT ID",
+       name: "azure_oauth2",
+       # label: "Provider name", # optional label for login button, defaults to "Azure AD"
+       args: {
+         client_id: "CLIENT ID",
+         client_secret: "CLIENT SECRET",
+         tenant_id: "TENANT ID",
        }
      }
    ]
@@ -72,9 +73,10 @@ As you go through the Microsoft procedure, keep the following in mind:
 
    ```yaml
    - { name: 'azure_oauth2',
-     args: { client_id: "CLIENT ID",
-     client_secret: "CLIENT SECRET",
-     tenant_id: "TENANT ID" } }
+       # label: 'Provider name', # optional label for login button, defaults to "Azure AD"
+       args: { client_id: 'CLIENT ID',
+       client_secret: 'CLIENT SECRET',
+       tenant_id: 'TENANT ID' } }
    ```
 
    The `base_azure_url` is optional and can be added for different locales;
@@ -167,6 +169,7 @@ Alternatively, add the `User.Read.All` application permission.
    gitlab_rails['omniauth_providers'] = [
      {
        "name" => "azure_activedirectory_v2",
+       "label" => "Provider name", # optional label for login button, defaults to "Azure AD v2"
        "args" => {
          "client_id" => "CLIENT ID",
          "client_secret" => "CLIENT SECRET",
@@ -180,9 +183,10 @@ Alternatively, add the `User.Read.All` application permission.
 
    ```yaml
    - { name: 'azure_activedirectory_v2',
-     args: { client_id: "CLIENT ID",
-     client_secret: "CLIENT SECRET",
-     tenant_id: "TENANT ID" } }
+       label: 'Provider name', # optional label for login button, defaults to "Azure AD v2"
+       args: { client_id: "CLIENT ID",
+       client_secret: "CLIENT SECRET",
+       tenant_id: "TENANT ID" } }
    ```
 
    The `base_azure_url` is optional and can be added for different locales;