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 /app | |
| parent | d02a25c8704150b5ad0c516720ce625256f7cbac (diff) | |
Add latest changes from gitlab-org/gitlab@16-1-stable-ee
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/import/bitbucket_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/import/bitbucket_controller.rb b/app/controllers/import/bitbucket_controller.rb index c933b05e0c4..196fadb888d 100644 --- a/app/controllers/import/bitbucket_controller.rb +++ b/app/controllers/import/bitbucket_controller.rb @@ -129,7 +129,7 @@ class Import::BitbucketController < Import::BaseController 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 def verify_bitbucket_import_enabled |