aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2016-08-16 06:35:01 -0300
committerGitHub <noreply@github.com>2016-08-16 06:35:01 -0300
commitd24f31adb83c1e9ca7da45cc7ffb110f2d0c2e0c (patch)
tree9ee08eeb04c3c977ef59ba6a5e42b5d073937df2 /actionpack/lib/action_controller
parentc65c1721e2a137c3bb7a877fa4cfb3f78f89401a (diff)
parentd6339275a063ac7a6044dbc1a67fe38561e9aee1 (diff)
downloadrails-d24f31adb83c1e9ca7da45cc7ffb110f2d0c2e0c.tar.gz
rails-d24f31adb83c1e9ca7da45cc7ffb110f2d0c2e0c.tar.bz2
rails-d24f31adb83c1e9ca7da45cc7ffb110f2d0c2e0c.zip
Merge pull request #26094 from igorkasyanchuk/master
Show unpermitted parameters as symbols in logs (so they could be copy…
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/log_subscriber.rb2
-rw-r--r--actionpack/lib/action_controller/metal/strong_parameters.rb4
2 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/log_subscriber.rb b/actionpack/lib/action_controller/log_subscriber.rb
index e09977d2cf..d29a5fe68f 100644
--- a/actionpack/lib/action_controller/log_subscriber.rb
+++ b/actionpack/lib/action_controller/log_subscriber.rb
@@ -51,7 +51,7 @@ module ActionController
def unpermitted_parameters(event)
debug do
unpermitted_keys = event.payload[:keys]
- "Unpermitted parameter#{'s' if unpermitted_keys.size > 1}: #{unpermitted_keys.join(", ")}"
+ "Unpermitted parameter#{'s' if unpermitted_keys.size > 1}: #{unpermitted_keys.map { |e| ":#{e}" }.join(", ")}"
end
end
diff --git a/actionpack/lib/action_controller/metal/strong_parameters.rb b/actionpack/lib/action_controller/metal/strong_parameters.rb
index 5e7441b3ab..d62e01d185 100644
--- a/actionpack/lib/action_controller/metal/strong_parameters.rb
+++ b/actionpack/lib/action_controller/metal/strong_parameters.rb
@@ -32,13 +32,13 @@ module ActionController
#
# params = ActionController::Parameters.new(a: "123", b: "456")
# params.permit(:c)
- # # => ActionController::UnpermittedParameters: found unpermitted parameters: a, b
+ # # => ActionController::UnpermittedParameters: found unpermitted parameters: :a, :b
class UnpermittedParameters < IndexError
attr_reader :params # :nodoc:
def initialize(params) # :nodoc:
@params = params
- super("found unpermitted parameter#{'s' if params.size > 1 }: #{params.join(", ")}")
+ super("found unpermitted parameter#{'s' if params.size > 1 }: #{params.map { |e| ":#{e}" }.join(", ")}")
end
end