diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-03 10:27:58 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-10-03 10:27:58 -0700 |
| commit | befeeb2d0aef8db4ba84d1e2fa0d273f8a111363 (patch) | |
| tree | 70e00f8546f6bb7765474dd792c1d08ed7ecac19 /activesupport/lib/active_support/option_merger.rb | |
| parent | 5aee516b5edb49d7206cd9815c13a78b6b16c5d9 (diff) | |
| parent | 83c4b0a7f977b75a9005ceb78d8a2a719392d904 (diff) | |
| download | rails-befeeb2d0aef8db4ba84d1e2fa0d273f8a111363.tar.gz rails-befeeb2d0aef8db4ba84d1e2fa0d273f8a111363.tar.bz2 rails-befeeb2d0aef8db4ba84d1e2fa0d273f8a111363.zip | |
Merge branch '3-2-stable' into 3-2-sec
* 3-2-stable:
make sure both headers are set before checking for ip spoofing
Move set_inverse_instance to association.build_record
Diffstat (limited to 'activesupport/lib/active_support/option_merger.rb')
0 files changed, 0 insertions, 0 deletions