aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorSerj L <gelvior@gmail.com>2014-02-24 13:25:38 +0400
committerSerj L <gelvior@gmail.com>2014-02-24 13:25:38 +0400
commit88cfeca16ac6643134c29e79f88ca47cbaaf1d37 (patch)
tree00b5f166ce013078b281668c2d53cd3959c15f0d /actionpack/lib
parent174c9f0df39cd338a4871f82794256cc64f68a81 (diff)
downloadrails-88cfeca16ac6643134c29e79f88ca47cbaaf1d37.tar.gz
rails-88cfeca16ac6643134c29e79f88ca47cbaaf1d37.tar.bz2
rails-88cfeca16ac6643134c29e79f88ca47cbaaf1d37.zip
Simple Sungularize ActionController::UnpermittedParameters error in case when only 1 parameter is unpermitted.
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/log_subscriber.rb2
-rw-r--r--actionpack/lib/action_controller/metal/strong_parameters.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/log_subscriber.rb b/actionpack/lib/action_controller/log_subscriber.rb
index 823a1050b5..e920a33765 100644
--- a/actionpack/lib/action_controller/log_subscriber.rb
+++ b/actionpack/lib/action_controller/log_subscriber.rb
@@ -50,7 +50,7 @@ module ActionController
def unpermitted_parameters(event)
unpermitted_keys = event.payload[:keys]
- debug("Unpermitted parameters: #{unpermitted_keys.join(", ")}")
+ debug("Unpermitted parameter#{'s' if unpermitted_keys.size > 1}: #{unpermitted_keys.join(", ")}")
end
def deep_munge(event)
diff --git a/actionpack/lib/action_controller/metal/strong_parameters.rb b/actionpack/lib/action_controller/metal/strong_parameters.rb
index 48a916f2b1..aff083b502 100644
--- a/actionpack/lib/action_controller/metal/strong_parameters.rb
+++ b/actionpack/lib/action_controller/metal/strong_parameters.rb
@@ -32,7 +32,7 @@ module ActionController
def initialize(params) # :nodoc:
@params = params
- super("found unpermitted parameters: #{params.join(", ")}")
+ super("found unpermitted parameter#{'s' if params.size > 1 }: #{params.join(", ")}")
end
end