From 3f86af1883ebc2ce18888587fb7b7e7dc98c0514 Mon Sep 17 00:00:00 2001
From: ulferts <jens.ulferts@googlemail.com>
Date: Tue, 18 Feb 2020 09:33:47 +0100
Subject: [PATCH 01/16] use actuall released friendly_id again

---
 Gemfile      |  3 +--
 Gemfile.lock | 12 +++---------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/Gemfile b/Gemfile
index 998f1dee59..982e12a77a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -50,8 +50,7 @@ gem 'warden-basic_auth', '~> 0.2.1'
 
 gem 'will_paginate', '~> 3.1.7'
 
-# Replace once friendly_id release supports rails 6
-gem 'friendly_id', git: 'https://github.com/norman/friendly_id', ref: '67422c04e1bfed4207b2a04826bc67ec0e231ce7'
+gem 'friendly_id', '~> 5.3.0'
 
 gem 'acts_as_list', '~> 0.9.9'
 gem 'acts_as_tree', '~> 2.9.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index c01d8cf863..75a400f275 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -31,14 +31,6 @@ GIT
       capybara
       rspec
 
-GIT
-  remote: https://github.com/norman/friendly_id
-  revision: 67422c04e1bfed4207b2a04826bc67ec0e231ce7
-  ref: 67422c04e1bfed4207b2a04826bc67ec0e231ce7
-  specs:
-    friendly_id (5.2.5)
-      activerecord (>= 4.0.0)
-
 GIT
   remote: https://github.com/opf/omniauth
   revision: fe862f986b2e846e291784d2caa3d90a658c67f0
@@ -516,6 +508,8 @@ GEM
       fog-core
       nokogiri (>= 1.5.11, < 2.0.0)
     formatador (0.2.5)
+    friendly_id (5.3.0)
+      activerecord (>= 4.0.0)
     fuubar (2.3.2)
       rspec-core (~> 3.0)
       ruby-progressbar (~> 1.4)
@@ -996,7 +990,7 @@ DEPENDENCIES
   faker
   flamegraph
   fog-aws
-  friendly_id!
+  friendly_id (~> 5.3.0)
   fuubar (~> 2.3.2)
   gon (~> 6.2.1)
   grape (~> 1.3.0)

From 58d3e6b2ff5f062fb2e5f5fdcd78ea03d53d78ef Mon Sep 17 00:00:00 2001
From: ulferts <jens.ulferts@googlemail.com>
Date: Tue, 18 Feb 2020 09:36:50 +0100
Subject: [PATCH 02/16] bump pg

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

diff --git a/Gemfile b/Gemfile
index 982e12a77a..ac3ed7bd1c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -283,7 +283,7 @@ gem 'roar', '~> 1.1.0'
 
 platforms :mri, :mingw, :x64_mingw do
   group :postgres do
-    gem 'pg', '~> 1.1.0'
+    gem 'pg', '~> 1.2.2'
   end
 
   # Support application loading when no database exists yet.
diff --git a/Gemfile.lock b/Gemfile.lock
index 75a400f275..49839dbde7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -664,7 +664,7 @@ GEM
       hashery (~> 2.0)
       ruby-rc4
       ttfunk
-    pg (1.1.4)
+    pg (1.2.2)
     plaintext (0.3.3)
       activesupport (> 2.2.1)
       nokogiri (~> 1.10, >= 1.10.4)
@@ -1041,7 +1041,7 @@ DEPENDENCIES
   overviews!
   parallel_tests (~> 2.29.2)
   passenger (~> 6.0.1)
-  pg (~> 1.1.0)
+  pg (~> 1.2.2)
   plaintext (~> 0.3.2)
   posix-spawn (~> 0.3.13)
   prawn (~> 2.2)

From c355738159414f61bdd0437d759e948035b9141e Mon Sep 17 00:00:00 2001
From: ulferts <jens.ulferts@googlemail.com>
Date: Tue, 18 Feb 2020 09:37:43 +0100
Subject: [PATCH 03/16] bump oj

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

diff --git a/Gemfile b/Gemfile
index ac3ed7bd1c..5e2c61df05 100644
--- a/Gemfile
+++ b/Gemfile
@@ -104,7 +104,7 @@ gem 'posix-spawn', '~> 0.3.13', require: false
 gem 'bcrypt', '~> 3.1.6'
 
 gem 'multi_json', '~> 1.13.1'
-gem 'oj', '~> 3.9.1'
+gem 'oj', '~> 3.10.2'
 
 gem 'daemons'
 gem 'delayed_job_active_record', '~> 4.1.4'
diff --git a/Gemfile.lock b/Gemfile.lock
index 49839dbde7..04427ae868 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -630,7 +630,7 @@ GEM
       nokogiri (~> 1.8, >= 1.8.4)
     octokit (4.14.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    oj (3.9.1)
+    oj (3.10.2)
     okcomputer (1.18.1)
     omniauth-saml (1.10.1)
       omniauth (~> 1.3, >= 1.3.2)
@@ -1011,7 +1011,7 @@ DEPENDENCIES
   net-ldap (~> 0.16.0)
   newrelic_rpm
   nokogiri (~> 1.10.8)
-  oj (~> 3.9.1)
+  oj (~> 3.10.2)
   okcomputer (~> 1.18.1)
   omniauth!
   omniauth-openid-connect!

From a8c946bc8af4fd6f6bf5ca482f41bec1ff79346b Mon Sep 17 00:00:00 2001
From: ulferts <jens.ulferts@googlemail.com>
Date: Tue, 3 Mar 2020 10:12:22 +0100
Subject: [PATCH 04/16] bump rubocop

---
 Gemfile.lock | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 04427ae868..401376f292 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -550,7 +550,7 @@ GEM
     interception (0.5)
     ipaddress (0.8.3)
     iso8601 (0.12.1)
-    jaro_winkler (1.5.3)
+    jaro_winkler (1.5.4)
     jmespath (1.4.0)
     jquery-tablesorter (1.27.0)
       railties (~> 6.0.0, >= 3.2)
@@ -647,10 +647,10 @@ GEM
       validate_url
       webfinger (>= 1.0.1)
     openproject-token (1.0.2)
-    parallel (1.17.0)
+    parallel (1.19.1)
     parallel_tests (2.29.2)
       parallel
-    parser (2.6.4.0)
+    parser (2.7.0.4)
       ast (~> 2.4.0)
     passenger (6.0.2)
       rack
@@ -783,6 +783,7 @@ GEM
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     retriable (3.1.2)
+    rexml (3.2.4)
     rinku (2.0.4)
     roar (1.1.0)
       representable (~> 3.0.0)
@@ -811,11 +812,12 @@ GEM
     rspec-retry (0.6.1)
       rspec-core (> 3.3)
     rspec-support (3.9.0)
-    rubocop (0.74.0)
+    rubocop (0.80.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      rexml
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
     ruby-duration (3.2.3)
@@ -905,7 +907,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.5)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.6.1)
     unicorn (5.5.1)
       kgio (~> 2.6)
       raindrops (~> 0.7)

From a84dbcd42dd45a33c7cfc46026e0aef79741286f Mon Sep 17 00:00:00 2001
From: ulferts <jens.ulferts@googlemail.com>
Date: Tue, 3 Mar 2020 10:13:39 +0100
Subject: [PATCH 05/16] bump nokogiri

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 401376f292..fe3b71ef74 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -624,7 +624,7 @@ GEM
     newrelic_rpm (6.6.0.358)
     nio4r (2.5.2)
     no_proxy_fix (0.1.2)
-    nokogiri (1.10.8)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     nokogumbo (2.0.1)
       nokogiri (~> 1.8, >= 1.8.4)

From c0a7b085a53789e8a18421b95bd4bd2971ea5789 Mon Sep 17 00:00:00 2001
From: ulferts <jens.ulferts@googlemail.com>
Date: Tue, 3 Mar 2020 10:14:03 +0100
Subject: [PATCH 06/16] bump puma

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index fe3b71ef74..fa3858a57c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -694,7 +694,7 @@ GEM
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
     public_suffix (4.0.1)
-    puma (4.3.1)
+    puma (4.3.3)
       nio4r (~> 2.0)
     rack (2.1.1)
     rack-accept (0.4.5)

From 47aef3a89cb209c40700f416a298b86beef98c72 Mon Sep 17 00:00:00 2001
From: ulferts <jens.ulferts@googlemail.com>
Date: Tue, 3 Mar 2020 10:14:54 +0100
Subject: [PATCH 07/16] bump bootsnap

---
 Gemfile.lock | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index fa3858a57c..14f3b3617b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -324,7 +324,7 @@ GEM
     bindata (2.4.4)
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
-    bootsnap (1.4.5)
+    bootsnap (1.4.6)
       msgpack (~> 1.0)
     bourbon (6.0.0)
       thor (~> 0.19)
@@ -610,7 +610,7 @@ GEM
     minisyntax (0.2.5)
     minitest (5.14.0)
     mixlib-shellout (2.1.0)
-    msgpack (1.3.1)
+    msgpack (1.3.3)
     multi_json (1.13.1)
     multi_test (0.1.2)
     multipart-post (2.1.1)

From 37fcf0d83a0a89aeabe134dd6d433e338e063223 Mon Sep 17 00:00:00 2001
From: ulferts <jens.ulferts@googlemail.com>
Date: Tue, 3 Mar 2020 10:16:11 +0100
Subject: [PATCH 08/16] bump i18n-js

---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index 5e2c61df05..c01887abe3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -154,7 +154,7 @@ end
 
 gem 'autoprefixer-rails', '~> 9.4.5'
 gem 'bourbon', '~> 6.0.0'
-gem 'i18n-js', '~> 3.2.0'
+gem 'i18n-js', '~> 3.6.0'
 gem 'sassc-rails', '~> 2.1.0'
 gem 'sprockets', '~> 3.7.0'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 14f3b3617b..54f61eac6d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -370,7 +370,7 @@ GEM
       ruby-enum (~> 0.5)
     compare-xml (0.66)
       nokogiri (~> 1.8)
-    concurrent-ruby (1.1.5)
+    concurrent-ruby (1.1.6)
     cork (0.3.0)
       colored2 (~> 3.1)
     crack (0.4.3)
@@ -542,7 +542,7 @@ GEM
     httpclient (2.8.3)
     i18n (1.8.2)
       concurrent-ruby (~> 1.0)
-    i18n-js (3.2.1)
+    i18n-js (3.6.0)
       i18n (>= 0.6.6)
     icalendar (2.5.3)
       ice_cube (~> 0.16)
@@ -999,7 +999,7 @@ DEPENDENCIES
   grids!
   html-pipeline (~> 2.12.0)
   htmldiff
-  i18n-js (~> 3.2.0)
+  i18n-js (~> 3.6.0)
   json_spec (~> 1.1.4)
   ladle
   launchy (~> 2.4.3)

From de6da87d36c642422f1f55ff37b4626d62d52e23 Mon Sep 17 00:00:00 2001
From: ulferts <jens.ulferts@googlemail.com>
Date: Tue, 3 Mar 2020 10:18:19 +0100
Subject: [PATCH 09/16] bump html-pipeline

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 54f61eac6d..e2bce06a8d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -533,7 +533,7 @@ GEM
     hashdiff (1.0.0)
     hashery (2.1.2)
     hashie (3.6.0)
-    html-pipeline (2.12.0)
+    html-pipeline (2.12.3)
       activesupport (>= 2)
       nokogiri (>= 1.4)
     htmldiff (0.0.1)

From c7dc369f1cba6a75d7af75402a32c4af9be02b96 Mon Sep 17 00:00:00 2001
From: ulferts <jens.ulferts@googlemail.com>
Date: Tue, 3 Mar 2020 10:20:08 +0100
Subject: [PATCH 10/16] bump gon and by that rack

---
 Gemfile      | 2 +-
 Gemfile.lock | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index c01887abe3..5e830629f5 100644
--- a/Gemfile
+++ b/Gemfile
@@ -126,7 +126,7 @@ gem 'browser', '~> 2.6.1'
 # Providing health checks
 gem 'okcomputer', '~> 1.18.1'
 
-gem 'gon', '~> 6.2.1'
+gem 'gon', '~> 6.3.2'
 
 # Lograge to provide sane and non-verbose logging
 gem 'lograge', '~> 0.10.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index e2bce06a8d..6e9d3cdf9a 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -518,8 +518,9 @@ GEM
     git (1.5.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
-    gon (6.2.1)
-      actionpack (>= 3.0)
+    gon (6.3.2)
+      actionpack (>= 3.0.20)
+      i18n (>= 0.7)
       multi_json
       request_store (>= 1.0)
     grape (1.3.0)
@@ -696,7 +697,7 @@ GEM
     public_suffix (4.0.1)
     puma (4.3.3)
       nio4r (~> 2.0)
-    rack (2.1.1)
+    rack (2.2.2)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-attack (6.1.0)
@@ -994,7 +995,7 @@ DEPENDENCIES
   fog-aws
   friendly_id (~> 5.3.0)
   fuubar (~> 2.3.2)
-  gon (~> 6.2.1)
+  gon (~> 6.3.2)
   grape (~> 1.3.0)
   grids!
   html-pipeline (~> 2.12.0)

From 39c836dd777d9fb38f406459773654e4c01280f8 Mon Sep 17 00:00:00 2001
From: ulferts <jens.ulferts@googlemail.com>
Date: Tue, 3 Mar 2020 10:20:57 +0100
Subject: [PATCH 11/16] bump oj

---
 Gemfile.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 6e9d3cdf9a..a6eb671db4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -631,7 +631,7 @@ GEM
       nokogiri (~> 1.8, >= 1.8.4)
     octokit (4.14.0)
       sawyer (~> 0.8.0, >= 0.5.3)
-    oj (3.10.2)
+    oj (3.10.3)
     okcomputer (1.18.1)
     omniauth-saml (1.10.1)
       omniauth (~> 1.3, >= 1.3.2)

From b9d73163146cae63cc62a3656206709a7eef8b95 Mon Sep 17 00:00:00 2001
From: ulferts <jens.ulferts@googlemail.com>
Date: Tue, 3 Mar 2020 13:29:51 +0100
Subject: [PATCH 12/16] attempt to fix flickering spec

---
 modules/bim/spec/requests/api/bcf/v2_1/topics_api_spec.rb | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/modules/bim/spec/requests/api/bcf/v2_1/topics_api_spec.rb b/modules/bim/spec/requests/api/bcf/v2_1/topics_api_spec.rb
index a5bf0761ee..98bf0b316c 100644
--- a/modules/bim/spec/requests/api/bcf/v2_1/topics_api_spec.rb
+++ b/modules/bim/spec/requests/api/bcf/v2_1/topics_api_spec.rb
@@ -678,11 +678,10 @@ describe 'BCF 2.1 topics resource', type: :request, content_type: :json, with_ma
 
     it_behaves_like 'bcf api successful response' do
       let(:expected_body) do
-        issue = Bim::Bcf::Issue.last
-        work_package = WorkPackage.last
+        work_package.reload
 
         {
-          guid: issue&.uuid,
+          guid: bcf_issue&.uuid,
           topic_type: type.name,
           topic_status: status.name,
           priority: priority.name,

From ba316383a7577facd55668b353f888fee4f2b2d3 Mon Sep 17 00:00:00 2001
From: ulferts <jens.ulferts@googlemail.com>
Date: Tue, 3 Mar 2020 13:37:30 +0100
Subject: [PATCH 13/16] bump autoprefixer-rails

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

diff --git a/Gemfile b/Gemfile
index 5e830629f5..a715f0614c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -152,7 +152,7 @@ group :production do
   gem 'unicorn-worker-killer', require: false
 end
 
-gem 'autoprefixer-rails', '~> 9.4.5'
+gem 'autoprefixer-rails', '~> 9.7.4'
 gem 'bourbon', '~> 6.0.0'
 gem 'i18n-js', '~> 3.6.0'
 gem 'sassc-rails', '~> 2.1.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index a6eb671db4..cec2de1a10 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -296,7 +296,7 @@ GEM
       rbtree3 (~> 0.5)
     ast (2.4.0)
     attr_required (1.0.1)
-    autoprefixer-rails (9.4.7)
+    autoprefixer-rails (9.7.4)
       execjs
     awesome_nested_set (3.2.0)
       activerecord (>= 4.0.0, < 7.0)
@@ -957,7 +957,7 @@ DEPENDENCIES
   acts_as_tree (~> 2.9.0)
   addressable (~> 2.7.0)
   airbrake (~> 9.4.3)
-  autoprefixer-rails (~> 9.4.5)
+  autoprefixer-rails (~> 9.7.4)
   awesome_nested_set (~> 3.2.0)
   aws-sdk-core (~> 3.66.0)
   aws-sdk-s3 (~> 1.48.0)

From 47015633ea6fcdff0ab2b5bdfd0698d672393605 Mon Sep 17 00:00:00 2001
From: ulferts <jens.ulferts@googlemail.com>
Date: Tue, 3 Mar 2020 13:39:01 +0100
Subject: [PATCH 14/16] bump rack-attack

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

diff --git a/Gemfile b/Gemfile
index a715f0614c..60650e76b7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -115,7 +115,7 @@ gem 'rack-protection', '~> 2.0.0'
 # It allows whitelisting, blacklisting, throttling, and tracking based
 # on arbitrary properties of the request.
 # https://github.com/kickstarter/rack-attack
-gem 'rack-attack', '~> 6.1.0'
+gem 'rack-attack', '~> 6.2.2'
 
 # CSP headers
 gem 'secure_headers', '~> 6.3.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index cec2de1a10..87bd500d34 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -700,7 +700,7 @@ GEM
     rack (2.2.2)
     rack-accept (0.4.5)
       rack (>= 0.4)
-    rack-attack (6.1.0)
+    rack-attack (6.2.2)
       rack (>= 1.0, < 3)
     rack-mini-profiler (1.0.1)
       rack (>= 1.2.0)
@@ -1054,7 +1054,7 @@ DEPENDENCIES
   pry-rescue (~> 1.5.0)
   pry-stack_explorer (~> 0.4.9.2)
   puma (~> 4.3.1)
-  rack-attack (~> 6.1.0)
+  rack-attack (~> 6.2.2)
   rack-mini-profiler
   rack-protection (~> 2.0.0)
   rack-test (~> 1.1.0)

From a0d29cce5065233a8383dfbea7e169ce7087e9ce Mon Sep 17 00:00:00 2001
From: ulferts <jens.ulferts@googlemail.com>
Date: Tue, 3 Mar 2020 13:40:22 +0100
Subject: [PATCH 15/16] bump rack-protection

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

diff --git a/Gemfile b/Gemfile
index 60650e76b7..25b2fe409d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -109,7 +109,7 @@ gem 'oj', '~> 3.10.2'
 gem 'daemons'
 gem 'delayed_job_active_record', '~> 4.1.4'
 
-gem 'rack-protection', '~> 2.0.0'
+gem 'rack-protection', '~> 2.0.8'
 
 # Rack::Attack is a rack middleware to protect your web app from bad clients.
 # It allows whitelisting, blacklisting, throttling, and tracking based
diff --git a/Gemfile.lock b/Gemfile.lock
index 87bd500d34..4a74650987 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -710,7 +710,7 @@ GEM
       httpclient
       json-jwt (>= 1.9.0)
       rack
-    rack-protection (2.0.7)
+    rack-protection (2.0.8.1)
       rack
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -1056,7 +1056,7 @@ DEPENDENCIES
   puma (~> 4.3.1)
   rack-attack (~> 6.2.2)
   rack-mini-profiler
-  rack-protection (~> 2.0.0)
+  rack-protection (~> 2.0.8)
   rack-test (~> 1.1.0)
   rack_session_access
   rails (~> 6.0.2)

From 69b2db5e1a99e44bb2674d7bb1a61eec73333ce1 Mon Sep 17 00:00:00 2001
From: ulferts <jens.ulferts@googlemail.com>
Date: Tue, 3 Mar 2020 13:41:53 +0100
Subject: [PATCH 16/16] bump multi_json

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

diff --git a/Gemfile b/Gemfile
index 25b2fe409d..c83f12ed09 100644
--- a/Gemfile
+++ b/Gemfile
@@ -103,7 +103,7 @@ gem 'posix-spawn', '~> 0.3.13', require: false
 
 gem 'bcrypt', '~> 3.1.6'
 
-gem 'multi_json', '~> 1.13.1'
+gem 'multi_json', '~> 1.14.1'
 gem 'oj', '~> 3.10.2'
 
 gem 'daemons'
diff --git a/Gemfile.lock b/Gemfile.lock
index 4a74650987..52511b2cb9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -612,7 +612,7 @@ GEM
     minitest (5.14.0)
     mixlib-shellout (2.1.0)
     msgpack (1.3.3)
-    multi_json (1.13.1)
+    multi_json (1.14.1)
     multi_test (0.1.2)
     multipart-post (2.1.1)
     mustermann (1.1.1)
@@ -1009,7 +1009,7 @@ DEPENDENCIES
   livingstyleguide (~> 2.1.0)
   lograge (~> 0.10.0)
   meta-tags (~> 2.11.0)
-  multi_json (~> 1.13.1)
+  multi_json (~> 1.14.1)
   my_page!
   net-ldap (~> 0.16.0)
   newrelic_rpm