diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-24 00:10:34 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-24 00:10:34 +0300 |
| commit | de5fc582771ba7e2dc6e1c783ce8ee417fbe6788 (patch) | |
| tree | 3376365943e60af4b8d670f2f9d8dbfd8ae572e2 /lib/gitlab/auth | |
| parent | 0eb05ee0ea5d4e88a1cae604f7ff92507f16d4b0 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/auth')
| -rw-r--r-- | lib/gitlab/auth/o_auth/provider.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/gitlab/auth/o_auth/provider.rb b/lib/gitlab/auth/o_auth/provider.rb index 2c2fb743927..2ce8677c8b7 100644 --- a/lib/gitlab/auth/o_auth/provider.rb +++ b/lib/gitlab/auth/o_auth/provider.rb @@ -68,7 +68,9 @@ module Gitlab nil end else - provider = Gitlab.config.omniauth.providers.find { |provider| provider.name == name } + provider = Gitlab.config.omniauth.providers.find do |provider| + provider.name == name || (provider.name == 'openid_connect' && provider.args.name == name) + end merge_provider_args_with_defaults!(provider) provider |