Merge branch 'ck3g-fix-kwargs-url-blocker' into 'master'

Fixing kwargs deprecation warnings for 2.7

See merge request gitlab-org/gitlab!49457

app/controllers/import/bulk_imports_controller.rb

@@ -84,11 +84,9 @@ class Import::BulkImportsController < ApplicationController
   def verify_blocked_uri
     Gitlab::UrlBlocker.validate!(
       session[url_key],
-      **{
-        allow_localhost: allow_local_requests?,
-        allow_local_network: allow_local_requests?,
-        schemes: %w(http https)
-      }
+      allow_localhost: allow_local_requests?,
+      allow_local_network: allow_local_requests?,
+      schemes: %w(http https)
     )
   rescue Gitlab::UrlBlocker::BlockedUrlError => e
     clear_session_data

app/controllers/import/fogbugz_controller.rb

@@ -136,11 +136,9 @@ class Import::FogbugzController < Import::BaseController
   def verify_blocked_uri
     Gitlab::UrlBlocker.validate!(
       params[:uri],
-      **{
-        allow_localhost: allow_local_requests?,
-        allow_local_network: allow_local_requests?,
-        schemes: %w(http https)
-      }
+      allow_localhost: allow_local_requests?,
+      allow_local_network: allow_local_requests?,
+      schemes: %w(http https)
     )
   rescue Gitlab::UrlBlocker::BlockedUrlError => e
     redirect_to new_import_fogbugz_url, alert: _('Specified URL cannot be used: "%{reason}"') % { reason: e.message }

app/controllers/import/gitea_controller.rb

@@ -72,11 +72,9 @@ class Import::GiteaController < Import::GithubController
   def verify_blocked_uri
     Gitlab::UrlBlocker.validate!(
       provider_url,
-      {
-        allow_localhost: allow_local_requests?,
-        allow_local_network: allow_local_requests?,
-        schemes: %w(http https)
-      }
+      allow_localhost: allow_local_requests?,
+      allow_local_network: allow_local_requests?,
+      schemes: %w(http https)
     )
   rescue Gitlab::UrlBlocker::BlockedUrlError => e
     session[access_token_key] = nil

app/services/import/bitbucket_server_service.rb

@@ -81,11 +81,9 @@ module Import
     def blocked_url?
       Gitlab::UrlBlocker.blocked_url?(
         url,
-        {
-          allow_localhost: allow_local_requests?,
-          allow_local_network: allow_local_requests?,
-          schemes: %w(http https)
-        }
+        allow_localhost: allow_local_requests?,
+        allow_local_network: allow_local_requests?,
+        schemes: %w(http https)
       )
     end
 

app/services/import/github_service.rb

@@ -70,11 +70,9 @@ module Import
     def blocked_url?
       Gitlab::UrlBlocker.blocked_url?(
         url,
-        {
-          allow_localhost: allow_local_requests?,
-          allow_local_network: allow_local_requests?,
-          schemes: %w(http https)
-        }
+        allow_localhost: allow_local_requests?,
+        allow_local_network: allow_local_requests?,
+        schemes: %w(http https)
       )
     end