diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-06-02 12:36:36 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-06-02 12:36:36 -0300 |
| commit | fd3c55f09fdfb45c33a5383af2c0b9ddf8f63e90 (patch) | |
| tree | 89f6b8eeae81ba9e9f3c43667b234b64a776e649 /actionpack/lib/action_controller/routing/resources.rb | |
| parent | 5255a81b808c2c947d58df979e6436b1fe1d8157 (diff) | |
| parent | 196f780e30fcece25e4d09c12f9b9f7374ebed29 (diff) | |
| download | rails-fd3c55f09fdfb45c33a5383af2c0b9ddf8f63e90.tar.gz rails-fd3c55f09fdfb45c33a5383af2c0b9ddf8f63e90.tar.bz2 rails-fd3c55f09fdfb45c33a5383af2c0b9ddf8f63e90.zip | |
Merge commit 'rails/master'
Conflicts:
activerecord/lib/active_record.rb
Diffstat (limited to 'actionpack/lib/action_controller/routing/resources.rb')
| -rw-r--r-- | actionpack/lib/action_controller/routing/resources.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/lib/action_controller/routing/resources.rb b/actionpack/lib/action_controller/routing/resources.rb index 86abb7b2f4..05c782d226 100644 --- a/actionpack/lib/action_controller/routing/resources.rb +++ b/actionpack/lib/action_controller/routing/resources.rb @@ -1,3 +1,6 @@ +require 'active_support/core_ext/hash/slice' +require 'active_support/core_ext/object/try' + module ActionController # == Overview # |