Commit 3eadb4d8 authored by Jacob Vosmaer's avatar Jacob Vosmaer

Merge branch 'saml_social_provider' into '7-12-stable'

Merge branch 'SAML_1888' into 'master'

Add SAML to list of social_provider

See merge request !894
parents 9852183e d835b20d
......@@ -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