aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/option_merger_test.rb
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2016-01-26 17:24:37 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2016-01-26 17:24:37 -0800
commit9777a97ffaedcec9b95cb1678e4c74b7cac514ea (patch)
tree95ce3be36d397df75196ed98202636599689de9f /activesupport/test/option_merger_test.rb
parent0361d8449ff1c18da041df4b7dfe648abf0f1887 (diff)
parentf31a386c7ecdfe8a9173655b515470a2fbc9fcdd (diff)
downloadrails-9777a97ffaedcec9b95cb1678e4c74b7cac514ea.tar.gz
rails-9777a97ffaedcec9b95cb1678e4c74b7cac514ea.tar.bz2
rails-9777a97ffaedcec9b95cb1678e4c74b7cac514ea.zip
Merge pull request #23242 from maclover7/fix-error-sec
Fix undefined error for `ActionController::Parameters`
Diffstat (limited to 'activesupport/test/option_merger_test.rb')
0 files changed, 0 insertions, 0 deletions