diff options
| author | wycats <wycats@gmail.com> | 2010-04-14 17:12:26 -0700 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-04-14 17:15:13 -0700 |
| commit | 8c3bfa4ce94bc69573283be5d432df3892a9fd29 (patch) | |
| tree | fe40de21107d1e1ea099500cf7fc8887f5d06a27 | |
| parent | 6be04c46316dae0abcdfc38f95f00315f418898f (diff) | |
| download | rails-8c3bfa4ce94bc69573283be5d432df3892a9fd29.tar.gz rails-8c3bfa4ce94bc69573283be5d432df3892a9fd29.tar.bz2 rails-8c3bfa4ce94bc69573283be5d432df3892a9fd29.zip | |
Rely specifically on 0.6.0 and add a missing require
| -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 |