summaryrefslogtreecommitdiff
path: root/lib/github/import.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/github/import.rb')
-rw-r--r--lib/github/import.rb17
1 files changed, 1 insertions, 16 deletions
diff --git a/lib/github/import.rb b/lib/github/import.rb
index 69bc5f08d9a..8ca7b678633 100644
--- a/lib/github/import.rb
+++ b/lib/github/import.rb
@@ -50,7 +50,7 @@ module Github
@repo = project.import_source
@repo_url = project.import_url
@wiki_url = project.import_url.sub(/\.git\z/, '.wiki.git')
- @options = options.reverse_merge(url: root_endpoint)
+ @options = options
@verbose = options.fetch(:verbose, false)
@cached = Hash.new { |hash, key| hash[key] = Hash.new }
@errors = []
@@ -383,20 +383,5 @@ module Github
def error(type, url, message)
errors << { type: type, url: Gitlab::UrlSanitizer.sanitize(url), error: message }
end
-
- def root_endpoint
- @root_endpoint ||= custom_endpoint || githup_endpoint
- end
-
- def custom_endpoint
- Gitlab.config.omniauth.providers
- .find { |provider| provider.name == 'github' }
- .to_h
- .dig('args', 'client_options', 'site')
- end
-
- def github_endpoint
- OmniAuth::Strategies::GitHub.default_options[:client_options][:site]
- end
end
end