aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2014-02-25 09:00:50 +0100
committerXavier Noria <fxn@hashref.com>2014-02-25 09:00:50 +0100
commitfcf4a0d214c87cadb4c4f250932c6ff78d55029d (patch)
tree4e815031946c6b595834e9eb4834329c7af1d226 /actionpack/lib/action_controller/metal
parent418d1e521660a76f62af4e813eb28838a1229100 (diff)
parent88cfeca16ac6643134c29e79f88ca47cbaaf1d37 (diff)
downloadrails-fcf4a0d214c87cadb4c4f250932c6ff78d55029d.tar.gz
rails-fcf4a0d214c87cadb4c4f250932c6ff78d55029d.tar.bz2
rails-fcf4a0d214c87cadb4c4f250932c6ff78d55029d.zip
Merge pull request #14006 from Loremaster/strong_params_improvement
Sungularize ActionController::UnpermittedParameters error in case when only 1 parameter is unpermitted.
Diffstat (limited to 'actionpack/lib/action_controller/metal')
-rw-r--r--actionpack/lib/action_controller/metal/strong_parameters.rb2
1 files changed, 1 insertions, 1 deletions
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