Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42

1 files changed, 18 insertions, 3 deletions

diff --git a/lib/gitlab/github_import.rb b/lib/gitlab/github_import.rb
index 9a7c406d981..c3cc15e10f7 100644
--- a/lib/gitlab/github_import.rb
+++ b/lib/gitlab/github_import.rb
@@ -6,10 +6,13 @@ module Gitlab
       [:heads, :tags, '+refs/pull/*/head:refs/merge-requests/*/head']
     end
 
-    def self.new_client_for(project, token: nil, parallel: true)
+    def self.new_client_for(project, token: nil, host: nil, parallel: true)
       token_to_use = token || project.import_data&.credentials&.fetch(:user)
-
-      Client.new(token_to_use, parallel: parallel)
+      Client.new(
+        token_to_use,
+        host: host.presence || self.formatted_import_url(project),
+        parallel: parallel
+      )
     end
 
     # Returns the ID of the ghost user.
@@ -18,5 +21,17 @@ module Gitlab
 
       Gitlab::Cache::Import::Caching.read_integer(key) || Gitlab::Cache::Import::Caching.write(key, User.select(:id).ghost.id)
     end
+
+    # Get formatted GitHub import URL. If github.com is in the import URL, this will return nil and octokit will use the default github.com API URL
+    def self.formatted_import_url(project)
+      url = URI.parse(project.import_url)
+
+      unless url.host == 'github.com'
+        url.user = nil
+        url.password = nil
+        url.path = "/api/v3"
+        url.to_s
+      end
+    end
   end
 end