diff options
author | José Valim <jose.valim@gmail.com> | 2012-04-24 02:00:30 -0700 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2012-04-24 02:00:30 -0700 |
commit | 242f4d1ebadd0cff83c10270aecd56752b9befc5 (patch) | |
tree | 2a938076b5e6ab9d2daced061dc891bb41a9416b /actionpack/lib/action_dispatch | |
parent | 82c3aca17e78d25f217702e530586673f2a219d7 (diff) | |
parent | ef7815b15ddf2b899129ba860f811608725bd583 (diff) | |
download | rails-242f4d1ebadd0cff83c10270aecd56752b9befc5.tar.gz rails-242f4d1ebadd0cff83c10270aecd56752b9befc5.tar.bz2 rails-242f4d1ebadd0cff83c10270aecd56752b9befc5.zip |
Merge pull request #5954 from bogdan/routes
Add missing requires in routes
Diffstat (limited to 'actionpack/lib/action_dispatch')
-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' |