From 841f346aa42742cb6a016cf40005009f0d7dcbf1 Mon Sep 17 00:00:00 2001
From: Luke Barratt <luke@barratt.me>
Date: Tue, 7 Apr 2015 21:19:25 +0100
Subject: [PATCH] Update `rbenv_ruby` to 2.1.5 for deployments. Bump puma
 webserver version.

---
 Gemfile          | 2 +-
 Gemfile.lock     | 4 ++--
 config/deploy.rb | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 2e783d4..f22590d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,7 @@ gem 'dotenv-rails', '~> 0.10.0'
 gem 'rails', '~> 3.2.19'
 gem 'mysql2', '~> 0.3.15'
 gem 'dalli', '~> 2.7.0'
-gem 'puma', '~> 2.9.1'
+gem 'puma', '~> 2.11.1'
 
 gem 'exceptional', '~> 2.0.33'
 gem 'oj', '~> 2.5.5'
diff --git a/Gemfile.lock b/Gemfile.lock
index 277b057..70af6dc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -162,7 +162,7 @@ GEM
     pry-byebug (1.3.2)
       byebug (~> 2.7)
       pry (~> 0.9.12)
-    puma (2.9.1)
+    puma (2.11.1)
       rack (>= 1.1, < 2.0)
     quiet_assets (1.0.2)
       railties (>= 3.1, < 5.0)
@@ -292,7 +292,7 @@ DEPENDENCIES
   oj (~> 2.5.5)
   poltergeist (~> 1.5.0)
   pry-byebug (~> 1.3.2)
-  puma (~> 2.9.1)
+  puma (~> 2.11.1)
   quiet_assets (~> 1.0.2)
   rails (~> 3.2.19)
   rails_autolink (~> 1.1.5)
diff --git a/config/deploy.rb b/config/deploy.rb
index f4ce51e..25b07bb 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -9,7 +9,7 @@ set :repo_url, 'https://github.com/ENSL/ensl.org.git'
 set :keep_releases, 10
 
 set :rbenv_type, :user
-set :rbenv_ruby, '2.1.3'
+set :rbenv_ruby, '2.1.5'
 set :bundle_flags, '--quiet'
 set :dotenv_role, [:app, :web]