aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2014-07-08 11:46:56 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2014-07-08 11:46:56 -0700
commit97d62a32f824ca54c6dee2033decb78f85217361 (patch)
tree7c7fc50df28335550aefba8c917777d784fcccc3 /Gemfile
parent3116dac121df6d2c9e1db683a9a95b56bd203b12 (diff)
parent46890ad18840a3f311bf3bf68e03cc605ca7bf12 (diff)
downloadrails-97d62a32f824ca54c6dee2033decb78f85217361.tar.gz
rails-97d62a32f824ca54c6dee2033decb78f85217361.tar.bz2
rails-97d62a32f824ca54c6dee2033decb78f85217361.zip
Merge pull request #13999 from jamox/update_rack
This updates rails to use edge rack
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Gemfile b/Gemfile
index 2a695df618..60c4b31e5b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,6 +7,7 @@ gemspec
# ensure correct loading order
gem 'mocha', '~> 0.14', require: false
+gem 'rack', github: 'rack/rack'
gem 'rack-cache', '~> 1.2'
gem 'jquery-rails', '~> 3.1.0'
gem 'turbolinks'