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

krainboltgreene · Jun 25, 2011 · 060155e · 060155e
2 parents fb4de1e + 16922f4
commit 060155e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/Gemfile b/Gemfile
@@ -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'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -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)