diff options
| author | Bogdan Gusiev <agresso@gmail.com> | 2012-04-23 14:31:38 +0300 |
|---|---|---|
| committer | Bogdan Gusiev <agresso@gmail.com> | 2012-04-23 14:31:38 +0300 |
| commit | ef7815b15ddf2b899129ba860f811608725bd583 (patch) | |
| tree | 59acb3193508aa3a0a26d6e0374935b79cc1ca07 | |
| parent | 5b8066715823220ebfe6773b8ac77dcd6d7954f6 (diff) | |
| download | rails-ef7815b15ddf2b899129ba860f811608725bd583.tar.gz rails-ef7815b15ddf2b899129ba860f811608725bd583.tar.bz2 rails-ef7815b15ddf2b899129ba860f811608725bd583.zip | |
Add missing requires in routes
| -rw-r--r-- | actionpack/lib/action_dispatch/http/mime_negotiation.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/http/mime_negotiation.rb b/actionpack/lib/action_dispatch/http/mime_negotiation.rb index 5c48a60469..e31f3b823d 100644 --- a/actionpack/lib/action_dispatch/http/mime_negotiation.rb +++ b/actionpack/lib/action_dispatch/http/mime_negotiation.rb @@ -1,3 +1,5 @@ +require 'active_support/core_ext/module/attribute_accessors' + module ActionDispatch module Http module MimeNegotiation diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index ba4cfb482d..910dc8ed6c 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -1,4 +1,5 @@ require 'active_support/core_ext/hash/except' +require 'active_support/core_ext/hash/reverse_merge' require 'active_support/core_ext/object/blank' require 'active_support/core_ext/enumerable' require 'active_support/inflector' |