summaryrefslogtreecommitdiff
path: root/app/helpers/auth_helper.rb
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2016-02-02 17:23:34 -0500
committerRobert Speicher <rspeicher@gmail.com>2016-02-24 17:38:13 -0500
commitb95ef77e233eab3b3d37a4a7dce545d9da36f8a0 (patch)
treecd5717ac2010967f33ed35691093a3b2c040e3c9 /app/helpers/auth_helper.rb
parent4a9affa7330f2099f6385d3d74150f93cfd008f1 (diff)
downloadgitlab-ce-b95ef77e233eab3b3d37a4a7dce545d9da36f8a0.tar.gz
Move "I should see Crowd login form" feature to a view specrs-crowd-form-view-spec
We were doing all kinds of code gymnastics to "enable" Crowd in the feature spec and this would sometimes cause a transient failure. Really what it's testing is if the Crowd login form shows when Crowd's enabled, so this is much better suited to a view spec.
Diffstat (limited to 'app/helpers/auth_helper.rb')
-rw-r--r--app/helpers/auth_helper.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/helpers/auth_helper.rb b/app/helpers/auth_helper.rb
index de669e529a7..b4f80fd9b3e 100644
--- a/app/helpers/auth_helper.rb
+++ b/app/helpers/auth_helper.rb
@@ -6,6 +6,10 @@ module AuthHelper
Gitlab.config.ldap.enabled
end
+ def omniauth_enabled?
+ Gitlab.config.omniauth.enabled
+ end
+
def provider_has_icon?(name)
PROVIDERS_WITH_ICONS.include?(name.to_s)
end