From 761488506608945a345bf4af338a9e24e5d74318 Mon Sep 17 00:00:00 2001
From: Greg Lazarev <greg@thoughtbot.com>
Date: Fri, 29 Apr 2016 10:21:33 -0700
Subject: [PATCH] Use Ruby 2.3.1 (#1117)

---
 .ruby-version | 2 +-
 Gemfile       | 2 +-
 Gemfile.lock  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.ruby-version b/.ruby-version
index 276cbf9e2..2bf1c1ccf 100644
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-2.3.0
+2.3.1
diff --git a/Gemfile b/Gemfile
index cff7ec067..8543f1362 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-ruby "2.3.0"
+ruby "2.3.1"
 
 gem "active_model_serializers", "0.8.3"
 gem "administrate", ">= 0.1.3"
diff --git a/Gemfile.lock b/Gemfile.lock
index 8715ca4ba..11012f13b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -209,7 +209,7 @@ GEM
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
     powerpack (0.1.1)
-    puma (2.12.2)
+    puma (3.4.0)
     rack (1.6.4)
     rack-protection (1.5.3)
       rack