From 8f95e973b20791e4b2a0d79a6325a0f2a7d83462 Mon Sep 17 00:00:00 2001
From: Steffen van Bergerem <svbergerem@omgsrsly.net>
Date: Wed, 18 Jan 2017 21:30:03 +0100
Subject: [PATCH] Bump json

json 1.8.3 was incompatible with ruby 2.4.0

closes #7285
---
 Gemfile      | 2 +-
 Gemfile.lock | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 08656edb3..ddbd90f3d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -18,7 +18,7 @@ gem "diaspora_federation-rails", "0.1.7"
 # API and JSON
 
 gem "acts_as_api", "0.4.3"
-gem "json",        "1.8.3"
+gem "json",        "1.8.6"
 gem "json-schema", "2.7.0"
 
 # Authentication
diff --git a/Gemfile.lock b/Gemfile.lock
index ab4a78f3b..6de447fff 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -449,7 +449,7 @@ GEM
       sprockets-rails
     js_image_paths (0.1.0)
       rails (~> 4.0)
-    json (1.8.3)
+    json (1.8.6)
     json-jwt (1.6.3)
       activesupport
       bindata
@@ -954,7 +954,7 @@ DEPENDENCIES
   jquery-ui-rails (= 5.0.5)
   js-routes (= 1.2.9)
   js_image_paths (= 0.1.0)
-  json (= 1.8.3)
+  json (= 1.8.6)
   json-schema (= 2.7.0)
   json_spec (= 1.1.4)
   leaflet-rails (= 0.7.7)