summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorMatthew Firtion <matt.firtion@coveros.com>2015-06-25 09:58:55 -0400
committerMatthew Firtion <matt.firtion@coveros.com>2015-06-25 09:58:55 -0400
commit024e854eca2df3e1d49e1c3cdf39774e4e467b87 (patch)
treeee491974c1ca4831def71b3bebb2114eb67a2dc8 /app
parent6288677134d0e6d1f805748bc557091ad4747bd9 (diff)
downloadgitlab-ce-024e854eca2df3e1d49e1c3cdf39774e4e467b87.tar.gz
Add SAML to list of social_providermatt-firtion/gitlab-ce-SAML_1888
Diffstat (limited to 'app')
-rw-r--r--app/helpers/oauth_helper.rb2
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