diff --git a/chaos/Gemfile b/chaos/Gemfile index 3a94d26f..c1d2dac0 100644 --- a/chaos/Gemfile +++ b/chaos/Gemfile @@ -4,7 +4,7 @@ source 'https://rubygems.org' gemspec gem "capistrano" -gem 'json', '~> 1.7.7' +gem 'json', '~> 2.3.1' gem "rake" gem "yajl-ruby", :require => "yajl/json_gem" diff --git a/chaos/Gemfile.lock b/chaos/Gemfile.lock index ef8d2ac4..6cc3efea 100644 --- a/chaos/Gemfile.lock +++ b/chaos/Gemfile.lock @@ -42,7 +42,7 @@ GEM hashr (0.0.22) highline (1.6.19) i18n (0.6.5) - json (1.7.7) + json (2.3.1) listen (0.7.3) lumberjack (1.0.3) metaclass (0.0.1) @@ -129,7 +129,7 @@ DEPENDENCIES factory_girl guard guard-minitest - json (~> 1.7.7) + json (~> 2.3.1) mapa76-core! minitest mocha