diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-30 17:15:08 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-30 17:15:08 +0300 |
| commit | 427cb4dfa77bccf1594503a7e00d7e782e281c16 (patch) | |
| tree | dcafd13e81af3eb982ae1adcbb9dc18f0c5be1e9 /lib | |
| parent | d02a25c8704150b5ad0c516720ce625256f7cbac (diff) | |
Add latest changes from gitlab-org/gitlab@16-1-stable-ee
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bitbucket/connection.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/legacy_github_import/client.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/bitbucket/connection.rb b/lib/bitbucket/connection.rb index 9937236fc44..64550a0525c 100644 --- a/lib/bitbucket/connection.rb +++ b/lib/bitbucket/connection.rb @@ -63,7 +63,7 @@ module Bitbucket end def options - OmniAuth::Strategies::Bitbucket.default_options[:client_options].deep_symbolize_keys + OmniAuth::Strategies::Bitbucket.default_options[:client_options].to_h.deep_symbolize_keys end end end diff --git a/lib/gitlab/legacy_github_import/client.rb b/lib/gitlab/legacy_github_import/client.rb index 16c3bc09c4d..e1c3b09d371 100644 --- a/lib/gitlab/legacy_github_import/client.rb +++ b/lib/gitlab/legacy_github_import/client.rb @@ -116,7 +116,7 @@ module Gitlab if config config["args"]["client_options"].deep_symbolize_keys else - OmniAuth::Strategies::GitHub.default_options[:client_options].symbolize_keys + OmniAuth::Strategies::GitHub.default_options[:client_options].to_h.symbolize_keys end end |