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

1 files changed, 23 insertions, 16 deletions

diff --git a/doc/integration/github.md b/doc/integration/github.md
index 11a9a5ea64d..d8877e069b8 100644
--- a/doc/integration/github.md
+++ b/doc/integration/github.md
@@ -50,10 +50,11 @@ Follow these steps to incorporate the GitHub OAuth 2 app in your GitLab server:
    ```ruby
    gitlab_rails['omniauth_providers'] = [
      {
-       "name" => "github",
-       "app_id" => "YOUR_APP_ID",
-       "app_secret" => "YOUR_APP_SECRET",
-       "args" => { "scope" => "user:email" }
+       name: "github",
+       # label: "Provider name", # optional label for login button, defaults to "GitHub"
+       app_id: "YOUR_APP_ID",
+       app_secret: "YOUR_APP_SECRET",
+       args: { scope: "user:email" }
      }
    ]
    ```
@@ -63,11 +64,12 @@ Follow these steps to incorporate the GitHub OAuth 2 app in your GitLab server:
    ```ruby
    gitlab_rails['omniauth_providers'] = [
      {
-       "name" => "github",
-       "app_id" => "YOUR_APP_ID",
-       "app_secret" => "YOUR_APP_SECRET",
-       "url" => "https://github.example.com/",
-       "args" => { "scope" => "user:email" }
+       name: "github",
+       # label: "Provider name", # optional label for login button, defaults to "GitHub"
+       app_id: "YOUR_APP_ID",
+       app_secret: "YOUR_APP_SECRET",
+       url: "https://github.example.com/",
+       args: { scope: "user:email" }
      }
    ]
    ```
@@ -85,7 +87,9 @@ Follow these steps to incorporate the GitHub OAuth 2 app in your GitLab server:
    For GitHub.com:
 
    ```yaml
-   - { name: 'github', app_id: 'YOUR_APP_ID',
+   - { name: 'github',
+       # label: 'Provider name', # optional label for login button, defaults to "GitHub"
+       app_id: 'YOUR_APP_ID',
        app_secret: 'YOUR_APP_SECRET',
        args: { scope: 'user:email' } }
    ```
@@ -94,6 +98,7 @@ Follow these steps to incorporate the GitHub OAuth 2 app in your GitLab server:
 
    ```yaml
    - { name: 'github',
+       # label: 'Provider name', # optional label for login button, defaults to "GitHub"
        app_id: 'YOUR_APP_ID',
        app_secret: 'YOUR_APP_SECRET',
        url: "https://github.example.com/",
@@ -122,12 +127,13 @@ For Omnibus package:
 ```ruby
 gitlab_rails['omniauth_providers'] = [
   {
-    "name" => "github",
-    "app_id" => "YOUR_APP_ID",
-    "app_secret" => "YOUR_APP_SECRET",
-    "url" => "https://github.example.com/",
-    "verify_ssl" => false,
-    "args" => { "scope" => "user:email" }
+    name: "github",
+    # label: "Provider name", # optional label for login button, defaults to "GitHub"
+    app_id: "YOUR_APP_ID",
+    app_secret: "YOUR_APP_SECRET",
+    url: "https://github.example.com/",
+    verify_ssl: false,
+    args: { scope: "user:email" }
   }
 ]
 ```
@@ -142,6 +148,7 @@ For installation from source:
 
 ```yaml
 - { name: 'github',
+    # label: 'Provider name', # optional label for login button, defaults to "GitHub"
     app_id: 'YOUR_APP_ID',
     app_secret: 'YOUR_APP_SECRET',
     url: "https://github.example.com/",