diff options
| -rw-r--r-- | actionpack/actionpack.gemspec | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/test_case.rb | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec index ed5b7e1e93..f4aa4971b6 100644 --- a/actionpack/actionpack.gemspec +++ b/actionpack/actionpack.gemspec @@ -23,6 +23,6 @@ Gem::Specification.new do |s| s.add_dependency('activemodel', version) s.add_dependency('rack', '~> 1.1.0') s.add_dependency('rack-test', '~> 0.5.0') - s.add_dependency('rack-mount', '~> 0.6.0') + s.add_dependency('rack-mount', '= 0.6.0') s.add_dependency('erubis', '~> 2.6.5') end diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index dfd8e75bcc..b3758218a2 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -1,5 +1,6 @@ require 'rack/session/abstract/id' require 'active_support/core_ext/object/blank' +require 'active_support/core_ext/object/to_query' module ActionController module TemplateAssertions |