Merge pull request #33256 from ilkkao/ilkkao/remove-unused-params-option

Don't handle params option in a special way in url_for helper

actionpack/CHANGELOG.md

@@ -1,3 +1,7 @@
+*   Remove undocumented `params` option from `url_for` helper.
+
+    *Ilkka Oksanen*
+
 *   Encode Content-Disposition filenames on `send_data` and `send_file`.
     Previously, `send_data 'data', filename: "\u{3042}.txt"` sends
     `"filename=\"\u{3042}.txt\""` as Content-Disposition and it can be

actionpack/lib/action_dispatch/routing/route_set.rb

@@ -858,10 +858,6 @@ module ActionDispatch
 
         path, params = generate(route_name, path_options, recall)
 
-        if options.key? :params
-          params.merge! options[:params]
-        end
-
         options[:path]        = path
         options[:script_name] = script_name
         options[:params]      = params

actionpack/test/controller/base_test.rb

@@ -193,7 +193,7 @@ class UrlOptionsTest < ActionController::TestCase
       action: "home",
       controller: "pages",
       only_path: true,
-      params: { "token" => "secret" }
+      token: "secret"
     }
 
     assert_equal "/home?token=secret", rs.url_for(options)