Update puma

Coursemology · Oct 12, 2015 · 88d16f2 · 88d16f2
1 parent e7b7d00
commit 88d16f2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/Gemfile b/Gemfile
@@ -14,7 +14,7 @@ group :development do
 end
 
 group :production do
-  gem 'puma', "~> 2.6.0"
+  gem 'puma', "~> 2.14.0"
   gem 'dalli'
   gem 'connection_pool'
 end

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -294,8 +294,7 @@ GEM
       win32console (~> 1.3)
     pry-rails (0.3.2)
       pry (>= 0.9.10)
-    puma (2.6.0)
-      rack (>= 1.1, < 2.0)
+    puma (2.14.0)
     rack (1.4.7)
     rack-cache (1.5.0)
       rack (>= 0.4)
@@ -491,7 +490,7 @@ DEPENDENCIES
   omniauth-facebook
   paperclip (~> 3.0)
   pry-rails
-  puma (~> 2.6.0)
+  puma (~> 2.14.0)
   rails (= 3.2.22)
   rails-assets-fabric
   rollbar

diff --git a/puma.sh b/puma.sh
@@ -52,7 +52,7 @@ puma_high_memo() {
   fi
 }
 
-rvm use ruby-2.1.2
+rvm use ruby-2.2.2
 
 if [ $# -gt 0 ]; then
   #clean memory