diff options
| author | Marin Jankovski <marin@gitlab.com> | 2015-06-26 08:55:31 +0000 |
|---|---|---|
| committer | Marin Jankovski <marin@gitlab.com> | 2015-06-26 08:55:31 +0000 |
| commit | c342a9abccf27471a631c047b01911a242ce1106 (patch) | |
| tree | ee491974c1ca4831def71b3bebb2114eb67a2dc8 | |
| parent | 6288677134d0e6d1f805748bc557091ad4747bd9 (diff) | |
| parent | 024e854eca2df3e1d49e1c3cdf39774e4e467b87 (diff) | |
| download | gitlab-ce-c342a9abccf27471a631c047b01911a242ce1106.tar.gz | |
Merge branch 'SAML_1888' into 'master'
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 |