Permalink
Browse files

Merge branch 'hotfix/rack-gemfile-fix' into develop

  • Loading branch information...
2 parents fb4de1e + 16922f4 commit 060155e1287cf6d1805e4c9f38e0a6706494f216 Kurtis Rainbolt-Greene committed Jun 25, 2011
Showing with 13 additions and 1 deletion.
  1. +6 −1 Gemfile
  2. +7 −0 Gemfile.lock
View
@@ -10,4 +10,9 @@ gem 'coderay', '0.9.8'
gem 'heroku', '2.3.3'
gem 'rspec', '2.6.0'
-gem 'capybara', '1.0.0'
+gem 'capybara', '1.0.0'
+
+gem 'rack', '1.3.0'
+gem 'rack-contrib', '1.1.0'
+gem 'rack-rewrite', '1.0.2'
+gem 'mime-types', '1.16'
View
@@ -31,6 +31,9 @@ GEM
cri (>= 1.0.0)
nokogiri (1.4.6)
rack (1.3.0)
+ rack-contrib (1.1.0)
+ rack (>= 0.9.1)
+ rack-rewrite (1.0.2)
rack-test (0.6.0)
rack (>= 1.0)
rake (0.9.2)
@@ -64,7 +67,11 @@ DEPENDENCIES
coderay (= 0.9.8)
haml (= 3.1.2)
heroku (= 2.3.3)
+ mime-types (= 1.16)
nanoc (= 3.1.7)
+ rack (= 1.3.0)
+ rack-contrib (= 1.1.0)
+ rack-rewrite (= 1.0.2)
redcarpet (= 1.17.2)
rspec (= 2.6.0)
sass (= 3.1.3)

0 comments on commit 060155e

Please sign in to comment.