From 847ea18f17688164c46ed7be59b8c070f980d4ec Mon Sep 17 00:00:00 2001
From: Luke Barratt <luke@barratt.me>
Date: Sat, 27 Sep 2014 19:42:24 +0100
Subject: [PATCH] Bump Ruby and puma versions

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

diff --git a/Gemfile b/Gemfile
index 34b7d6d..fd44e33 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,12 +1,12 @@
 source 'http://rubygems.org'
 
-ruby '2.1.2'
+ruby '2.1.3'
 
 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.0'
+gem 'puma', '~> 2.9.1'
 
 gem 'exceptional', '~> 2.0.33'
 gem 'oj', '~> 2.5.5'
diff --git a/Gemfile.lock b/Gemfile.lock
index 11f37e6..277b057 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.0)
+    puma (2.9.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.0)
+  puma (~> 2.9.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 e2ae9ca..f4ce51e 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.2'
+set :rbenv_ruby, '2.1.3'
 set :bundle_flags, '--quiet'
 set :dotenv_role, [:app, :web]