Commit d835b20d authored by Marin Jankovski's avatar Marin Jankovski Committed by Marin Jankovski

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
parent 9852183e
......@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment