From 517f908881af6259cbd49acad59dd7e1c34c3401 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 28 Jul 2020 04:16:12 +0000
Subject: [PATCH] Bump json from 1.8.3 to 2.3.1

Bumps [json](https://github.com/flori/json) from 1.8.3 to 2.3.1.
- [Release notes](https://github.com/flori/json/releases)
- [Changelog](https://github.com/flori/json/blob/master/CHANGES.md)
- [Commits](https://github.com/flori/json/compare/v1.8.3...v2.3.1)

Signed-off-by: dependabot[bot] <support@github.com>
---
 Gemfile      |  2 +-
 Gemfile.lock | 21 ++++++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Gemfile b/Gemfile
index 72433e6e8..1efa6852c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -15,7 +15,7 @@ gem 'coffee-rails', '= 3.2.2'
 gem 'uglifier', '= 1.2.3'
 gem 'jquery-rails', '= 3.1.0'
 gem 'jquery-ui-rails', '= 4.1.2'
-gem 'json', '= 1.8.3'
+gem 'json', '2.3.1'
 gem 'sinatra', '= 1.3.2'
 gem 'selenium-webdriver', '= 2.44.0'
 gem 'god', :git => 'git://github.com/mojombo/god.git', :ref => '92c06aa5f6293cf26498a306e9bb7ac856d7dca0'
diff --git a/Gemfile.lock b/Gemfile.lock
index 0c5266b97..2a74efa32 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -188,11 +188,12 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    carrierwave (0.10.0)
+    carrierwave (0.11.2)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
       json (>= 1.7)
       mime-types (>= 1.16)
+      mimemagic (>= 0.3.0)
     childprocess (0.5.9)
       ffi (~> 1.0, >= 1.0.11)
     climate_control (0.0.3)
@@ -207,6 +208,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.10.0)
+    concurrent-ruby (1.1.6)
     deep_merge (1.1.1)
     deface (0.9.1)
       nokogiri (~> 1.5.0)
@@ -260,7 +262,8 @@ GEM
     highline (1.7.8)
     hike (1.2.3)
     htmlentities (4.3.4)
-    i18n (0.7.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
     i18n-js (2.1.2)
       i18n
     inherited_resources (1.4.1)
@@ -273,7 +276,7 @@ GEM
     jquery-ui-rails (4.1.2)
       railties (>= 3.1.0)
     jruby-pageant (1.1.1)
-    json (1.8.3)
+    json (2.3.1)
     jwt (1.4.1)
     kaminari (0.13.0)
       actionpack (>= 3.0.0)
@@ -295,9 +298,10 @@ GEM
       rails (> 3.0.0)
     method_source (0.8.2)
     mime-types (1.25.1)
+    mimemagic (0.3.5)
     modernizr-rails (2.7.1)
     mono_logger (1.1.0)
-    multi_json (1.13.1)
+    multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     net-scp (1.0.4)
@@ -361,7 +365,7 @@ GEM
       method_source (~> 0.8)
       slop (~> 3.4)
     rack (1.4.7)
-    rack-cache (1.6.1)
+    rack-cache (1.12.0)
       rack (>= 0.4)
     rack-protection (1.5.3)
       rack
@@ -378,8 +382,7 @@ GEM
       railties (>= 3.2.8)
     raindrops (0.16.0)
     rake (10.5.0)
-    rdoc (3.12.2)
-      json (~> 1.4)
+    rdoc (3.9.5)
     recaptcha (4.3.1)
       json
     recurrence (1.2.0)
@@ -460,7 +463,7 @@ GEM
       activerecord (>= 3.0.3)
       builder (>= 2.1.2)
       riddle (>= 1.5.3)
-    thor (0.19.1)
+    thor (0.20.3)
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot
@@ -511,7 +514,7 @@ DEPENDENCIES
   hashie (= 2.1.2)
   jquery-rails (= 3.1.0)
   jquery-ui-rails (= 4.1.2)
-  json (= 1.8.3)
+  json (= 2.3.1)
   jwt (= 1.4.1)
   mailboxer (= 0.10.3)
   net-ssh (= 2.4.0)