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

2 files changed, 8 insertions, 1 deletions

diff --git a/lib/gitlab/legacy_github_import/client.rb b/lib/gitlab/legacy_github_import/client.rb
index f7eaafeb446..4482610523e 100644
--- a/lib/gitlab/legacy_github_import/client.rb
+++ b/lib/gitlab/legacy_github_import/client.rb
@@ -24,6 +24,7 @@ module Gitlab
         @api ||= ::Octokit::Client.new(
           access_token: access_token,
           api_endpoint: api_endpoint,
+          web_endpoint: web_endpoint,
           # If there is no config, we're connecting to github.com and we
           # should verify ssl.
           connection_options: {
@@ -85,6 +86,10 @@ module Gitlab
         end
       end
 
+      def web_endpoint
+        host.presence || ::Octokit::Default.web_endpoint
+      end
+
       def config
         Gitlab::Auth::OAuth::Provider.config_for('github')
       end
diff --git a/lib/gitlab/legacy_github_import/importer.rb b/lib/gitlab/legacy_github_import/importer.rb
index 3f9fd1b1a19..a17e3b1ad5c 100644
--- a/lib/gitlab/legacy_github_import/importer.rb
+++ b/lib/gitlab/legacy_github_import/importer.rb
@@ -36,7 +36,7 @@ module Gitlab
           }
         end
 
-        @client = Client.new(credentials[:user], opts)
+        @client = Client.new(credentials[:user], **opts)
       end
 
       def execute
@@ -303,6 +303,8 @@ module Gitlab
         end
 
         imported!(resource_type)
+      rescue ::Octokit::NotFound => e
+        errors << { type: resource_type, errors: e.message }
       end
 
       def imported?(resource_type)