summaryrefslogtreecommitdiff
path: root/lib/gitlab/github_import
diff options
context:
space:
mode:
authorRubén Dávila <ruben@gitlab.com>2018-03-12 16:01:43 -0500
committerRubén Dávila <ruben@gitlab.com>2018-03-12 16:01:43 -0500
commitafe2c15e6bf1005e5bd1d213d3548a1a17a11137 (patch)
treea31f89b2ab3dbec92ef11fb2cf106d190ba68668 /lib/gitlab/github_import
parentafd2d381119c3778140c3dd63c7ef24ecdb4c62e (diff)
downloadgitlab-ce-afe2c15e6bf1005e5bd1d213d3548a1a17a11137.tar.gz
Fix provider server URL used when listing repos to importrd-fix-github-url-when-listing-repositories-at-importing
Also use Gitlab::Auth::OAuth::Provider.config_for to access OmniAuth config
Diffstat (limited to 'lib/gitlab/github_import')
-rw-r--r--lib/gitlab/github_import/client.rb5
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/gitlab/github_import/client.rb b/lib/gitlab/github_import/client.rb
index 4f160e4a447..a61beafae0d 100644
--- a/lib/gitlab/github_import/client.rb
+++ b/lib/gitlab/github_import/client.rb
@@ -197,10 +197,7 @@ module Gitlab
end
def github_omniauth_provider
- @github_omniauth_provider ||=
- Gitlab.config.omniauth.providers
- .find { |provider| provider.name == 'github' }
- .to_h
+ @github_omniauth_provider ||= Gitlab::Auth::OAuth::Provider.config_for('github').to_h
end
def rate_limit_counter