diff --git a/Gemfile b/Gemfile index 1a9d0c1c5b..b5ad0cdbab 100644 --- a/Gemfile +++ b/Gemfile @@ -4,6 +4,6 @@ group :base do gem 'mime-types', '1.25' gem 'rspec', '2.14.1' gem 'rake', '< 13.0.0' - gem 'json', '1.8.5' + gem 'json', '>= 2.3.0' gem 'rack', '< 2.0' end diff --git a/Gemfile.lock b/Gemfile.lock index d21524add2..0af67575c7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,7 +4,7 @@ GEM comp_tree (1.1.3) diff-lcs (1.4.4) comp_tree (>= 1.1.3) - json (1.8.5) + json (2.6.1) mime-types (1.25) rack (1.6.13) rake (12.3.3) @@ -21,7 +21,7 @@ PLATFORMS ruby DEPENDENCIES - json (= 1.8.5) + json (>= 2.3.0) mime-types (= 1.25) rack (< 2.0) rake (< 13.0.0) diff --git a/packaging/debian b/packaging/debian index 6afbf13b41..e3f5ab9738 160000 --- a/packaging/debian +++ b/packaging/debian @@ -1 +1 @@ -Subproject commit 6afbf13b410a27c896d0cbb40551b6436f0e1351 +Subproject commit e3f5ab97382de161f9e3927105a51402315116b3