diff options
| author | Marin Jankovski <marin@gitlab.com> | 2015-06-26 08:55:31 +0000 |
|---|---|---|
| committer | Marin Jankovski <maxlazio@gmail.com> | 2015-06-26 11:27:35 +0200 |
| commit | d835b20deb7047c747d4bbbf546933f2f0274c0b (patch) | |
| tree | 363e5581906ccf7d66902fcd8ee93323d656b827 | |
| parent | 9852183e3c135519c107bc36cc820b8f3b25f3a7 (diff) | |
| download | gitlab-ce-saml_social_provider.tar.gz | |
Merge branch 'SAML_1888' into 'master'saml_social_provider
Add SAML to list of social_provider
Resolves issue 1888. Still an issue because the SAML link under Connected Accounts will not have a logo.
See merge request !891
| -rw-r--r-- | app/helpers/oauth_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/oauth_helper.rb b/app/helpers/oauth_helper.rb index 997b91de077..2fdca13ed40 100644 --- a/app/helpers/oauth_helper.rb +++ b/app/helpers/oauth_helper.rb @@ -13,7 +13,7 @@ module OauthHelper def enabled_social_providers enabled_oauth_providers.select do |name| - [:twitter, :gitlab, :github, :bitbucket, :google_oauth2].include?(name.to_sym) + [:saml, :twitter, :gitlab, :github, :bitbucket, :google_oauth2].include?(name.to_sym) end end |