From d835b20deb7047c747d4bbbf546933f2f0274c0b Mon Sep 17 00:00:00 2001 From: Marin Jankovski Date: Fri, 26 Jun 2015 08:55:31 +0000 Subject: 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 --- app/helpers/oauth_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.1