Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'app/controllers/import/gitea_controller.rb')
-rw-r--r--app/controllers/import/gitea_controller.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/controllers/import/gitea_controller.rb b/app/controllers/import/gitea_controller.rb
index 2778b97419a..4e95c6527c3 100644
--- a/app/controllers/import/gitea_controller.rb
+++ b/app/controllers/import/gitea_controller.rb
@@ -85,7 +85,6 @@ class Import::GiteaController < Import::GithubController
@client ||= Gitlab::LegacyGithubImport::Client.new(session[access_token_key], **client_options)
end
- override :client_options
def client_options
verified_url, provider_hostname = verify_blocked_uri
@@ -99,7 +98,7 @@ class Import::GiteaController < Import::GithubController
allow_local_network: allow_local_requests?,
schemes: %w[http https]
)
- rescue Gitlab::UrlBlocker::BlockedUrlError => e
+ rescue Gitlab::HTTP_V2::UrlBlocker::BlockedUrlError => e
session[access_token_key] = nil
redirect_to new_import_url, alert: _('Specified URL cannot be used: "%{reason}"') % { reason: e.message }