diff options
| author | Yves Senn <yves.senn@gmail.com> | 2016-02-16 10:32:00 +0100 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2016-02-16 10:32:00 +0100 |
| commit | 3dd9fe5db44777eaf3765875fe259d53e72a0448 (patch) | |
| tree | 602d51d25203ecc379f9790b8762560a8ac6c765 | |
| parent | cf0b903f43369cafe3ef5f3a789c4a62f80d379d (diff) | |
| parent | 6d133a482af2428cfb1b67714ce7ffcb5bbd5f29 (diff) | |
| download | rails-3dd9fe5db44777eaf3765875fe259d53e72a0448.tar.gz rails-3dd9fe5db44777eaf3765875fe259d53e72a0448.tar.bz2 rails-3dd9fe5db44777eaf3765875fe259d53e72a0448.zip | |
Merge pull request #23692 from abhishekjain16/docs
Use a URL instead of an URL everywhere
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/url_for.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/controller/redirect_test.rb | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index 846b5fa1fc..310e98f584 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -289,7 +289,7 @@ module ActionDispatch if last.permitted? args.pop.to_h else - raise ArgumentError, "Generating an URL from non sanitized request parameters is insecure!" + raise ArgumentError, "Generating a URL from non sanitized request parameters is insecure!" end end helper.call self, args, options diff --git a/actionpack/lib/action_dispatch/routing/url_for.rb b/actionpack/lib/action_dispatch/routing/url_for.rb index f91679593e..28be189f93 100644 --- a/actionpack/lib/action_dispatch/routing/url_for.rb +++ b/actionpack/lib/action_dispatch/routing/url_for.rb @@ -173,7 +173,7 @@ module ActionDispatch route_name) when ActionController::Parameters unless options.permitted? - raise ArgumentError.new("Generating an URL from non sanitized request parameters is insecure!") + raise ArgumentError.new("Generating a URL from non sanitized request parameters is insecure!") end route_name = options.delete :use_route _routes.url_for(options.to_h.symbolize_keys. diff --git a/actionpack/test/controller/redirect_test.rb b/actionpack/test/controller/redirect_test.rb index 0b184eace9..3ea03be74a 100644 --- a/actionpack/test/controller/redirect_test.rb +++ b/actionpack/test/controller/redirect_test.rb @@ -310,7 +310,7 @@ class RedirectTest < ActionController::TestCase error = assert_raise(ArgumentError) do get :redirect_to_params end - assert_equal "Generating an URL from non sanitized request parameters is insecure!", error.message + assert_equal "Generating a URL from non sanitized request parameters is insecure!", error.message end def test_redirect_to_with_block |