Add latest changes from gitlab-org/gitlab@master

1 files changed, 23 insertions, 23 deletions

diff --git a/doc/integration/oauth2_generic.md b/doc/integration/oauth2_generic.md
index cdc7e6db61c..931feaa5bb3 100644
--- a/doc/integration/oauth2_generic.md
+++ b/doc/integration/oauth2_generic.md
@@ -61,30 +61,30 @@ This strategy is designed to allow configuration of the simple OmniAuth SSO proc
 
    ```ruby
    gitlab_rails['omniauth_providers'] = [
-     { 'name' => 'oauth2_generic',
-       'label' => '<your_oauth2_label>',
-       'app_id' => '<your_app_client_id>',
-       'app_secret' => '<your_app_client_secret>',
-       'args' => {
+     {
+       name: "oauth2_generic",
+       label: "Provider name", # optional label for login button, defaults to "Oauth2 Generic"
+       app_id: "<your_app_client_id>",
+       app_secret: "<your_app_client_secret>",
+       args: {
          client_options: {
-          'site' => '<your_auth_server_url>',
-          'user_info_url' => '/oauth2/v1/userinfo',
-          'authorize_url' => '/oauth2/v1/authorize',
-          'token_url' => '/oauth2/v1/token'
-        },
-        user_response_structure: {
-          root_path: [],
-          id_path: ['sub'],
-          attributes: { 
-            email: 'email',
-            name: 'name'
-          } 
-      },
-      authorize_params: {
-        scope: 'openid profile email' 
-      },
-      strategy_class: "OmniAuth::Strategies::OAuth2Generic"
-         }
+           site: "<your_auth_server_url>",
+           user_info_url: "/oauth2/v1/userinfo",
+           authorize_url: "/oauth2/v1/authorize",
+           token_url: "/oauth2/v1/token"
+         },
+         user_response_structure: {
+           root_path: [],
+           id_path: ["sub"],
+           attributes: {
+             email: "email",
+             name: "name"
+           }
+         },
+         authorize_params: {
+           scope: "openid profile email"
+         },
+         strategy_class: "OmniAuth::Strategies::OAuth2Generic"
        }
      }
    ]