summaryrefslogtreecommitdiff
path: root/doc/integration/omniauth.md
diff options
context:
space:
mode:
Diffstat (limited to 'doc/integration/omniauth.md')
-rw-r--r--doc/integration/omniauth.md53
1 files changed, 27 insertions, 26 deletions
diff --git a/doc/integration/omniauth.md b/doc/integration/omniauth.md
index 84a5a8e8c28..1b0bf9c5f64 100644
--- a/doc/integration/omniauth.md
+++ b/doc/integration/omniauth.md
@@ -1,18 +1,18 @@
# OmniAuth
GitLab leverages OmniAuth to allow users to sign in using Twitter, GitHub, and other popular services. Configuring
-OmniAuth does not prevent standard GitLab authentication or LDAP (if configured) from continuing to work. Users can
-choose to sign in using any of the configured mechanisms.
-+ [Initial OmniAuth Configuration](#initial-omniauth-configuration)
-+ [Supported Providers](#supported-providers)
-+ [Enable OmniAuth for an Existing User](#enable-omniauth-for-an-existing-user)
+OmniAuth does not prevent standard GitLab authentication or LDAP (if configured) from continuing to work. Users can choose to sign in using any of the configured mechanisms.
-### Initial OmniAuth Configuration
+- [Initial OmniAuth Configuration](#initial-omniauth-configuration)
+- [Supported Providers](#supported-providers)
+- [Enable OmniAuth for an Existing User](#enable-omniauth-for-an-existing-user)
+
+## Initial OmniAuth Configuration
Before configuring individual OmniAuth providers there are a few global settings that need to be verified.
-1. Open the configuration file<br />
+1. Open the configuration file.
```sh
cd /home/git/gitlab
@@ -20,7 +20,7 @@ Before configuring individual OmniAuth providers there are a few global settings
sudo -u git -H editor config/gitlab.yml
```
-2. Find the section dealing with OmniAuth. The section will look similar to the following.<br />
+1. Find the section dealing with OmniAuth. The section will look similar to the following.
```
## OmniAuth settings
@@ -52,32 +52,33 @@ Before configuring individual OmniAuth providers there are a few global settings
# args: { scope: 'user:email' } }
```
-3. Change `enabled` to `true`.
-4. Consider the next two configuration options: `allow_single_sign_on` and `block_auto_created_users`.
- * `allow_single_sign_on` defaults to `false`. If `false` users must be created manually or they will not be able to
+1. Change `enabled` to `true`.
+
+1. Consider the next two configuration options: `allow_single_sign_on` and `block_auto_created_users`.
+
+ - `allow_single_sign_on` defaults to `false`. If `false` users must be created manually or they will not be able to
sign in via OmniAuth.
- * `block_auto_created_users` defaults to `true`. If `true` auto created users will be blocked by default and will
+ - `block_auto_created_users` defaults to `true`. If `true` auto created users will be blocked by default and will
have to be unblocked by an administrator before they are able to sign in.
- * **Note:** If you set `allow_single_sign_on` to `true` and `block_auto_created_users` to `false` please be aware
+ - **Note:** If you set `allow_single_sign_on` to `true` and `block_auto_created_users` to `false` please be aware
that any user on the Internet will be able to successfully sign in to your GitLab without administrative approval.
-5. Choose one or more of the Supported Providers below to continue configuration.
-### Supported Providers
+1. Choose one or more of the Supported Providers below to continue configuration.
+
+## Supported Providers
-+ [GitHub](github.md)
-+ [Google](google.md)
-+ [Twitter](twitter.md)
+- [GitHub](github.md)
+- [Google](google.md)
+- [Twitter](twitter.md)
-### Enable OmniAuth for an Existing User
+## Enable OmniAuth for an Existing User
-Existing users can enable OmniAuth for specific providers after the account is created. For example, if the user
-originally signed in with LDAP an OmniAuth provider such as Twitter can be enabled. Follow the steps below to enable an
-OmniAuth provider for an existing user.
+Existing users can enable OmniAuth for specific providers after the account is created. For example, if the user originally signed in with LDAP an OmniAuth provider such as Twitter can be enabled. Follow the steps below to enable an OmniAuth provider for an existing user.
1. Sign in normally - whether standard sign in, LDAP, or another OmniAuth provider.
-2. Go to profile settings (the silhouette icon in the top right corner).
-3. Select the "Account" tab.
-4. Under "Social Accounts" select the desired OmniAuth provider, such as Twitter.
-5. The user will be redirected to the provider. Once the user authorized GitLab they will be redirected back to GitLab.
+1. Go to profile settings (the silhouette icon in the top right corner).
+1. Select the "Account" tab.
+1. Under "Social Accounts" select the desired OmniAuth provider, such as Twitter.
+1. The user will be redirected to the provider. Once the user authorized GitLab they will be redirected back to GitLab.
The chosen OmniAuth provider is now active and can be used to sign in to GitLab from then on.