diff options
| -rw-r--r-- | actionpack/test/controller/parameters/parameters_permit_test.rb | 2 | ||||
| -rw-r--r-- | activerecord/lib/active_record/define_callbacks.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/parameters/parameters_permit_test.rb b/actionpack/test/controller/parameters/parameters_permit_test.rb index 60bfb66f2f..92e134d313 100644 --- a/actionpack/test/controller/parameters/parameters_permit_test.rb +++ b/actionpack/test/controller/parameters/parameters_permit_test.rb @@ -179,7 +179,7 @@ class ParametersPermitTest < ActiveSupport::TestCase }, tabstops: [4, 8, 12, 16], suspicious: [true, Object.new, false, /yo!/], - dubious: [{a: :a, b: /wtf!/}, {c: :c}], + dubious: [{ a: :a, b: /wtf!/ }, { c: :c }], injected: Object.new }, hacked: 1 # not a hash diff --git a/activerecord/lib/active_record/define_callbacks.rb b/activerecord/lib/active_record/define_callbacks.rb index 47d3762245..7d955a24be 100644 --- a/activerecord/lib/active_record/define_callbacks.rb +++ b/activerecord/lib/active_record/define_callbacks.rb @@ -13,7 +13,7 @@ module ActiveRecord included do include ActiveModel::Validations::Callbacks - define_model_callbacks :initialize, :find, :touch, :only => :after + define_model_callbacks :initialize, :find, :touch, only: :after define_model_callbacks :save, :create, :update, :destroy end end |