diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-30 18:28:44 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-06-30 18:28:44 +0300 |
commit | 8cf61c17e9f20827896c44b1e0a1287b5a5dc507 (patch) | |
tree | 0077758ac9600d2e72451bf774bbe5932c5171c0 /lib | |
parent | 427cb4dfa77bccf1594503a7e00d7e782e281c16 (diff) |
Add latest changes from gitlab-org/gitlab@16-1-stable-ee
Diffstat (limited to 'lib')
-rw-r--r-- | lib/gitlab/legacy_github_import/client.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/legacy_github_import/client.rb b/lib/gitlab/legacy_github_import/client.rb index e1c3b09d371..bd788b4faf8 100644 --- a/lib/gitlab/legacy_github_import/client.rb +++ b/lib/gitlab/legacy_github_import/client.rb @@ -114,7 +114,7 @@ module Gitlab def github_options if config - config["args"]["client_options"].deep_symbolize_keys + config["args"]["client_options"].to_h.deep_symbolize_keys else OmniAuth::Strategies::GitHub.default_options[:client_options].to_h.symbolize_keys end |