Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

1 files changed, 2 insertions, 5 deletions

diff --git a/lib/api/import_github.rb b/lib/api/import_github.rb
index c91a7700f58..46ca8e4c428 100644
--- a/lib/api/import_github.rb
+++ b/lib/api/import_github.rb
@@ -3,19 +3,16 @@
 module API
   class ImportGithub < ::API::Base
     feature_category :importers
+    urgency :low
 
     rescue_from Octokit::Unauthorized, with: :provider_unauthorized
 
-    before do
-      forbidden! unless Gitlab::CurrentSettings.import_sources&.include?('github')
-    end
-
     helpers do
       def client
         @client ||= if Feature.enabled?(:remove_legacy_github_client)
                       Gitlab::GithubImport::Client.new(params[:personal_access_token], host: params[:github_hostname])
                     else
-                      Gitlab::LegacyGithubImport::Client.new(params[:personal_access_token], client_options)
+                      Gitlab::LegacyGithubImport::Client.new(params[:personal_access_token], **client_options)
                     end
       end