aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller.rb
diff options
context:
space:
mode:
authorColin Law <colin@clanlaw.org.uk>2009-01-11 12:13:50 +0000
committerColin Law <colin@clanlaw.org.uk>2009-01-11 12:13:50 +0000
commit55901d7d86f5608c4a07386ca6378121eb8127cb (patch)
tree8ede6a21529dfac8c818a3fe1584fb46f00c03ff /actionpack/lib/action_controller.rb
parent3e60ea6c231810e2b850492a86874b4800dfbf27 (diff)
parentcf4b24407ada79c133fbae1ec7db692882225956 (diff)
downloadrails-55901d7d86f5608c4a07386ca6378121eb8127cb.tar.gz
rails-55901d7d86f5608c4a07386ca6378121eb8127cb.tar.bz2
rails-55901d7d86f5608c4a07386ca6378121eb8127cb.zip
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'actionpack/lib/action_controller.rb')
-rw-r--r--actionpack/lib/action_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 98fb490d64..8c022e5625 100644
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -31,7 +31,7 @@ rescue LoadError
end
end
-gem 'rack', '~> 0.4.0'
+gem 'rack', '>= 0.9.0'
require 'rack'
module ActionController