diff options
| author | Richard Schneeman <richard.schneeman@gmail.com> | 2016-09-07 10:46:48 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-07 10:46:48 -0500 |
| commit | 71f37ce4893f63da49e4854db945a8ccb0ae3f5c (patch) | |
| tree | a5d560b794515dbf485733eb2122214b79267972 /actionpack/lib/action_controller | |
| parent | e703fc1f40c892771a0c3d81a03e7aa3561ef64a (diff) | |
| parent | 700c55831f993d52dcc1eb301346fbcfd54b82d9 (diff) | |
| download | rails-71f37ce4893f63da49e4854db945a8ccb0ae3f5c.tar.gz rails-71f37ce4893f63da49e4854db945a8ccb0ae3f5c.tar.bz2 rails-71f37ce4893f63da49e4854db945a8ccb0ae3f5c.zip | |
Merge pull request #26418 from y-yagi/fixes_26415
call `.to_h` to avoid using deprecated method
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/metal/strong_parameters.rb | 2 |
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 dea4657988..387c2aa0b9 100644 --- a/actionpack/lib/action_controller/metal/strong_parameters.rb +++ b/actionpack/lib/action_controller/metal/strong_parameters.rb @@ -578,7 +578,7 @@ module ActionController # +other_hash+ merges into current hash. def merge(other_hash) new_instance_with_inherited_permitted_status( - @parameters.merge(other_hash) + @parameters.merge(other_hash.to_h) ) end |