aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-01-06 15:36:38 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2009-01-06 15:36:38 -0800
commit851c3de5c973bf6c0abf2c3b24f1a71dafdcd97a (patch)
tree482f3ffc9108ba5723d9cfaa6d80d77399923170 /actionpack/lib
parent9b96e8d1ccb5b4548896b4100004e6371633f9fb (diff)
parentb7ea4add86231ef628d479516c8a09ca55e610bc (diff)
downloadrails-851c3de5c973bf6c0abf2c3b24f1a71dafdcd97a.tar.gz
rails-851c3de5c973bf6c0abf2c3b24f1a71dafdcd97a.tar.bz2
rails-851c3de5c973bf6c0abf2c3b24f1a71dafdcd97a.zip
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib')
-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