aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2019-07-23 23:43:04 +0200
committerHans de Graaff <graaff@gentoo.org>2019-07-23 23:43:04 +0200
commitbe66141d2eafa0714f91aad13457f609f0956e5c (patch)
tree16473cd277330a3779d3f85063b4e007c2e3b3f5
parentRemove obsolete comment (diff)
downloadglsamaker-be66141d2eafa0714f91aad13457f609f0956e5c.tar.gz
glsamaker-be66141d2eafa0714f91aad13457f609f0956e5c.tar.bz2
glsamaker-be66141d2eafa0714f91aad13457f609f0956e5c.zip
Update json to latest version
Signed-off-by: Hans de Graaff <graaff@gentoo.org>
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock4
2 files changed, 3 insertions, 3 deletions
diff --git a/Gemfile b/Gemfile
index f01784c..a60811e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -6,7 +6,7 @@ gem 'rake'
gem 'mysql2', '~> 0.4.10'
-gem 'json', '~>1.8.2'
+gem 'json', '~> 2.0'
gem 'jbuilder', '~> 2.0'
# Gems used only for assets and not required
diff --git a/Gemfile.lock b/Gemfile.lock
index fb16135..580817b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -79,7 +79,7 @@ GEM
activesupport (>= 4.2.0)
joiner (0.3.4)
activerecord (>= 4.1.0)
- json (1.8.6)
+ json (2.2.0)
kramdown (2.1.0)
loofah (2.2.3)
crass (~> 1.0.2)
@@ -225,7 +225,7 @@ DEPENDENCIES
diff-lcs
fastercsv
jbuilder (~> 2.0)
- json (~> 1.8.2)
+ json (~> 2.0)
kramdown
mechanize
minitest-reporters