diff --git a/Gemfile b/Gemfile index 2a8d33c42..94f799526 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,7 @@ gem 'unicorn', '4.6.2', :require => false # API and JSON gem 'acts_as_api', '0.4.1' -gem 'json', '1.7.7' +gem 'json', '1.8.0' # Authentication diff --git a/Gemfile.lock b/Gemfile.lock index 5a8229944..cd74491d5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -188,7 +188,7 @@ GEM jquery-ui-rails (3.0.1) jquery-rails railties (>= 3.1.0) - json (1.7.7) + json (1.8.0) jwt (0.1.8) multi_json (>= 1.5) kaminari (0.14.1) @@ -444,7 +444,7 @@ DEPENDENCIES i18n-inflector-rails (~> 1.0) jasmine (= 1.3.2) jquery-rails (= 2.1.4) - json (= 1.7.7) + json (= 1.8.0) markerb (= 1.0.1) messagebus_ruby_api (= 1.0.3) mini_magick (= 3.6.0)