Add puma to gemfile

drnic · Aug 2, 2012 · 778083f · 778083f
1 parent efcba5a
commit 778083f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/Gemfile b/Gemfile
@@ -6,6 +6,11 @@ gem "rails", "3.2.5"
 gem "sqlite3"
 gem "mysql2"
 
+# Supported app stacks
+gem "puma"
+gem "thin"
+gem "unicorn"
+
 # Auth
 gem "devise", "~> 2.1.0"
 
@@ -27,8 +32,6 @@ gem "six"
 gem "ffaker"
 gem "seed-fu"
 gem "redcarpet", "~> 2.1.1"
-gem "thin"
-gem "unicorn"
 gem "git"
 gem "acts_as_list"
 gem "acts-as-taggable-on", "2.3.1"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -233,6 +233,8 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.7.1)
       slop (>= 2.4.4, < 3)
+    puma (1.3.0)
+      rack (~> 1.2)
     pyu-ruby-sasl (0.0.3.3)
     rack (1.4.1)
     rack-cache (1.2)
@@ -407,6 +409,7 @@ DEPENDENCIES
   mysql2
   omniauth-ldap!
   pry
+  puma
   pygments.rb!
   rails (= 3.2.5)
   rails-footnotes

diff --git a/vendor/cache/puma-1.3.0.gem b/vendor/cache/puma-1.3.0.gem