diff options
| author | Douwe Maan <douwe@selenight.nl> | 2016-05-12 15:11:37 -0500 |
|---|---|---|
| committer | Douwe Maan <douwe@selenight.nl> | 2016-05-12 15:11:37 -0500 |
| commit | 74c69709dc19dbaf56c226b5a7955f229af10f4f (patch) | |
| tree | f30de4af54ac8397c92d48c0aa5d4943152b339c /doc/integration | |
| parent | f2303f9df061d6ff85d0ff0fee9e3aa54df97ea7 (diff) | |
| parent | d66833bca5ae0347751ceab99062b638965eab78 (diff) | |
| download | gitlab-ce-74c69709dc19dbaf56c226b5a7955f229af10f4f.tar.gz | |
Merge branch 'otzy007/gitlab-ce-disable_oauth_sign_in_sources'
Diffstat (limited to 'doc/integration')
| -rw-r--r-- | doc/integration/img/enabled-oauth-sign-in-sources.png | bin | 0 -> 49081 bytes | |||
| -rw-r--r-- | doc/integration/omniauth.md | 15 |
2 files changed, 15 insertions, 0 deletions
diff --git a/doc/integration/img/enabled-oauth-sign-in-sources.png b/doc/integration/img/enabled-oauth-sign-in-sources.png Binary files differnew file mode 100644 index 00000000000..95f8bbdcd24 --- /dev/null +++ b/doc/integration/img/enabled-oauth-sign-in-sources.png diff --git a/doc/integration/omniauth.md b/doc/integration/omniauth.md index cab329c0dec..820f40f81a9 100644 --- a/doc/integration/omniauth.md +++ b/doc/integration/omniauth.md @@ -11,6 +11,7 @@ of the configured mechanisms. - [Supported Providers](#supported-providers) - [Enable OmniAuth for an Existing User](#enable-omniauth-for-an-existing-user) - [OmniAuth configuration sample when using Omnibus GitLab](https://gitlab.com/gitlab-org/omnibus-gitlab/tree/master#omniauth-google-twitter-github-login) +- [Enable or disable Sign In with an OmniAuth provider without disabling import sources](#enable-or-disable-sign-in-with-an-omniauth-provider-without-disabling-import-sources) ## Supported Providers @@ -191,3 +192,17 @@ experience [in the public Wiki](https://github.com/gitlabhq/gitlab-public-wiki/w While we can't officially support every possible authentication mechanism out there, we'd like to at least help those with specific needs. + +## Enable or disable Sign In with an OmniAuth provider without disabling import sources + +>**Note:** +This setting was introduced with version 8.8 of GitLab. + +Administrators are able to enable or disable Sign In via some OmniAuth providers. + +>**Note:** +By default Sign In is enabled via all the OAuth Providers that have been configured in `config/gitlab.yml`. + +In order to enable/disable an OmniAuth provider, go to Admin Area -> Settings -> Sign-in Restrictions section -> Enabled OAuth Sign-In sources and select the providers you want to enable or disable. + + |
