Commit ca776698 authored by Mark Chao's avatar Mark Chao

Merge branch 'sh-fix-import-controller-kwarsg' into 'master'

Fix Ruby 2.7 deprecation warnings in app/controllers/import

See merge request gitlab-org/gitlab!43494
parents 872192f0 596f23d6
...@@ -136,7 +136,7 @@ class Import::FogbugzController < Import::BaseController ...@@ -136,7 +136,7 @@ class Import::FogbugzController < Import::BaseController
def verify_blocked_uri def verify_blocked_uri
Gitlab::UrlBlocker.validate!( Gitlab::UrlBlocker.validate!(
params[:uri], params[:uri],
{ **{
allow_localhost: allow_local_requests?, allow_localhost: allow_local_requests?,
allow_local_network: allow_local_requests?, allow_local_network: allow_local_requests?,
schemes: %w(http https) schemes: %w(http https)
......
...@@ -108,7 +108,7 @@ class Import::GithubController < Import::BaseController ...@@ -108,7 +108,7 @@ class Import::GithubController < Import::BaseController
@client ||= if Feature.enabled?(:remove_legacy_github_client) @client ||= if Feature.enabled?(:remove_legacy_github_client)
Gitlab::GithubImport::Client.new(session[access_token_key]) Gitlab::GithubImport::Client.new(session[access_token_key])
else else
Gitlab::LegacyGithubImport::Client.new(session[access_token_key], client_options) Gitlab::LegacyGithubImport::Client.new(session[access_token_key], **client_options)
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment