Update ruby version to 2.4.1, update json and puma

fs · Apr 10, 2017 · 0ce5f32 · 0ce5f32
1 parent c37debc
commit 0ce5f32
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-2.3.0
+2.4.1
diff --git a/Gemfile b/Gemfile
@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-ruby "2.3.0"
+ruby "2.4.1"
 
 gem "rails", "4.2.6"
 gem "pg"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -174,7 +174,7 @@ GEM
       rails-dom-testing (~> 1.0)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.3)
+    json (1.8.6)
     kaminari (0.16.3)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -210,7 +210,7 @@ GEM
       slop (~> 3.4)
     pry-rails (0.3.2)
       pry (>= 0.9.10)
-    puma (2.14.0)
+    puma (3.8.2)
     pundit (1.0.0)
       activesupport (>= 3.0.0)
     quiet_assets (1.0.2)
@@ -459,5 +459,8 @@ DEPENDENCIES
   web-console (~> 2.0)
   webmock
 
+RUBY VERSION
+   ruby 2.4.1p111
+
 BUNDLED WITH
-   1.11.2
+   1.14.6