diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-14 18:07:55 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-14 18:07:55 +0300 |
| commit | 85e494935a8726dc98bb19ffa584488420e5011e (patch) | |
| tree | 5acf279dab81a2363e4504a9679c32c16510542b /lib/gitlab/github_import | |
| parent | 4ce0bee95df15c05cdb0d777eba31fe753bc443b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/github_import')
| -rw-r--r-- | lib/gitlab/github_import/client.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/github_import/client.rb b/lib/gitlab/github_import/client.rb index 826b35d685c..22803c5cd71 100644 --- a/lib/gitlab/github_import/client.rb +++ b/lib/gitlab/github_import/client.rb @@ -189,7 +189,7 @@ module Gitlab end def default_api_endpoint - OmniAuth::Strategies::GitHub.default_options[:client_options][:site] + OmniAuth::Strategies::GitHub.default_options[:client_options][:site] || ::Octokit::Default.api_endpoint end def verify_ssl |