Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gitlab/auth/o_auth/provider.rb')
-rw-r--r--lib/gitlab/auth/o_auth/provider.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/auth/o_auth/provider.rb b/lib/gitlab/auth/o_auth/provider.rb
index 2ce8677c8b7..1f07baefa67 100644
--- a/lib/gitlab/auth/o_auth/provider.rb
+++ b/lib/gitlab/auth/o_auth/provider.rb
@@ -33,7 +33,7 @@ module Gitlab
end
def self.providers
- Devise.omniauth_providers
+ ::Devise.omniauth_providers
end
def self.enabled?(name)
@@ -69,7 +69,7 @@ module Gitlab
end
else
provider = Gitlab.config.omniauth.providers.find do |provider|
- provider.name == name || (provider.name == 'openid_connect' && provider.args.name == name)
+ provider.name == name || (provider.name == 'openid_connect' && provider.dig(:args, :name) == name)
end
merge_provider_args_with_defaults!(provider)