diff options
| author | Valery Sizov <valery@gitlab.com> | 2015-11-30 16:12:31 +0200 |
|---|---|---|
| committer | Valery Sizov <valery@gitlab.com> | 2015-11-30 16:12:31 +0200 |
| commit | e92ceb7b57139e985674a44cfe75534c52ed4acd (patch) | |
| tree | e4541606093f122532dfaaf7f460c30162771f31 /lib/gitlab | |
| parent | 461731f0769a826d00c4d5846ff6d2f55fd4b829 (diff) | |
| download | gitlab-ce-e92ceb7b57139e985674a44cfe75534c52ed4acd.tar.gz | |
fix specsrails_update_to_4_2
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/github_import/client.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/gitlab_import/client.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/github_import/client.rb b/lib/gitlab/github_import/client.rb index 270cbcd9ccd..74d1529e1ff 100644 --- a/lib/gitlab/github_import/client.rb +++ b/lib/gitlab/github_import/client.rb @@ -46,7 +46,7 @@ module Gitlab end def github_options - OmniAuth::Strategies::GitHub.default_options[:client_options].symbolize_keys + OmniAuth::Strategies::GitHub.default_options[:client_options].to_h.symbolize_keys end end end diff --git a/lib/gitlab/gitlab_import/client.rb b/lib/gitlab/gitlab_import/client.rb index 9c00896c913..86fb6c51765 100644 --- a/lib/gitlab/gitlab_import/client.rb +++ b/lib/gitlab/gitlab_import/client.rb @@ -75,7 +75,7 @@ module Gitlab end def gitlab_options - OmniAuth::Strategies::GitLab.default_options[:client_options].symbolize_keys + OmniAuth::Strategies::GitLab.default_options[:client_options].to_h.symbolize_keys end end end |