aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorAndrew White <andyw@pixeltrix.co.uk>2015-11-17 14:57:48 +0000
committerAndrew White <andyw@pixeltrix.co.uk>2015-11-17 14:57:48 +0000
commit5d1d5f2840cd9aabd87e9dd4a110578d6c30db47 (patch)
treeff3dfd5d40a6ea4f63f528874e3215b783dedfd7 /railties/lib
parent35ca78a07c8b09ed81f09fe227e37c59cf13bb6f (diff)
downloadrails-5d1d5f2840cd9aabd87e9dd4a110578d6c30db47.tar.gz
rails-5d1d5f2840cd9aabd87e9dd4a110578d6c30db47.tar.bz2
rails-5d1d5f2840cd9aabd87e9dd4a110578d6c30db47.zip
Raise ArgumentError when passing a truthy value to merge
In b71e08f we started raising when nil or false was passed to merge to fix #12264, however we should also do this for truthy values that are invalid like true.
Diffstat (limited to 'railties/lib')
0 files changed, 0 insertions, 0 deletions