From 72c436f0567e05ed85abb7ab7b160fa6283f737d Mon Sep 17 00:00:00 2001 From: "depfu[bot]" <23717796+depfu[bot]@users.noreply.github.com> Date: Thu, 19 Mar 2020 15:40:39 +0000 Subject: [PATCH] Update json to version 2.3.0 --- Gemfile | 2 +- Gemfile.lock | 52 ++++++++++++++++++++++++++-------------------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Gemfile b/Gemfile index a60eac29..fb24af04 100644 --- a/Gemfile +++ b/Gemfile @@ -46,7 +46,7 @@ gem 'rollbar' # TODO: make it optional via ENV flag gem 'newrelic_rpm' -gem 'json', '~> 1.8' +gem 'json', '~> 2.3' gem 'thread_safe', '0.3.6' group :assets do diff --git a/Gemfile.lock b/Gemfile.lock index dded63b8..a6be6475 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,8 +38,8 @@ GEM rails-html-sanitizer (~> 1.0, >= 1.0.3) active_model_serializers (0.8.1) activemodel (>= 3.0) - active_utils (1.0.5) - activesupport (>= 2.3.11) + active_utils (3.3.17) + activesupport (>= 4.2) i18n activejob (4.2.11) activesupport (= 4.2.11) @@ -83,7 +83,7 @@ GEM autoprefixer-rails (>= 9.1.0) popper_js (>= 1.14.3, < 2) sassc-rails (>= 2.0.0) - builder (3.2.3) + builder (3.2.4) cancan (1.6.9) capybara (3.12.0) addressable @@ -131,7 +131,7 @@ GEM warden (~> 1.2.3) devise-i18n (0.10.3) diff-lcs (1.3) - docile (1.3.1) + docile (1.3.2) domain_name (0.5.19) unf (>= 0.0.5, < 1.0.0) dotenv (2.6.0) @@ -154,15 +154,17 @@ GEM railties (>= 3.0.0) faker (1.9.3) i18n (>= 0.7) + faraday (1.0.0) + multipart-post (>= 1.2, < 3) ffi (1.9.25) font-awesome-sass (5.6.1) sassc (>= 1.11) foreman (0.63.0) dotenv (>= 0.7) thor (>= 0.13.6) - gibbon (1.1.5) - httparty - multi_json (>= 1.9.0) + gibbon (3.3.3) + faraday (>= 0.16.0) + multi_json (>= 1.11.0) globalid (0.4.2) activesupport (>= 4.2.0) gyoku (1.1.1) @@ -170,13 +172,11 @@ GEM highline (2.0.0) http-cookie (1.0.2) domain_name (~> 0.5) - httparty (0.13.3) - json (~> 1.8) - multi_xml (>= 0.5.2) httpi (2.1.0) rack rubyntlm (~> 0.3.2) - i18n (0.7.0) + i18n (0.9.5) + concurrent-ruby (~> 1.0) i18n-tasks (0.9.28) activesupport (>= 4.0.2) ast (>= 2.1.0) @@ -196,7 +196,7 @@ GEM thor (>= 0.14, < 2.0) jquery-ui-rails (4.0.5) railties (>= 3.1.0) - json (1.8.6) + json (2.3.0) kaminari (1.1.1) activesupport (>= 4.1.0) kaminari-actionview (= 1.1.1) @@ -233,16 +233,16 @@ GEM mime-types (1.25.1) mini_mime (1.0.1) mini_portile2 (2.4.0) - minitest (5.11.3) - mixlib-cli (1.4.0) - money (6.5.0) - i18n (>= 0.6.4, <= 0.7.0) - multi_json (1.13.1) - multi_xml (0.5.5) + minitest (5.14.0) + mixlib-cli (2.1.5) + money (6.13.7) + i18n (>= 0.6.4, <= 2) + multi_json (1.14.1) + multipart-post (2.1.1) net-http-digest_auth (1.4) net-http-persistent (2.9.4) newrelic_rpm (5.6.0.349) - nokogiri (1.10.1) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) nori (2.3.0) ntlm-http (0.1.1) @@ -351,8 +351,9 @@ GEM russian_central_bank (0.2.1) money (>= 5.0) savon (~> 2.0) - sandi_meter (1.1.6) + sandi_meter (1.2.0) json + launchy mixlib-cli sass (3.7.3) sass-listen (~> 4.0.0) @@ -395,11 +396,10 @@ GEM simple_form (4.0.0) actionpack (> 4) activemodel (> 4) - simplecov (0.16.1) + simplecov (0.18.5) docile (~> 1.1) - json (>= 1.8, < 3) - simplecov-html (~> 0.10.0) - simplecov-html (0.10.2) + simplecov-html (~> 0.11) + simplecov-html (0.12.2) sinatra (1.4.8) rack (~> 1.5) rack-protection (~> 1.4) @@ -425,7 +425,7 @@ GEM thread_safe (0.3.6) tilt (2.0.9) timecop (0.6.1) - tzinfo (1.2.5) + tzinfo (1.2.6) thread_safe (~> 0.1) uglifier (4.1.20) execjs (>= 0.3.0, < 3) @@ -486,7 +486,7 @@ DEPENDENCIES jbuilder (~> 1.0.1) jquery-rails jquery-ui-rails - json (~> 1.8) + json (~> 2.3) kaminari letter_opener mechanize