diff --git a/Gemfile b/Gemfile index 042f17f8c..e9cc1beda 100644 --- a/Gemfile +++ b/Gemfile @@ -15,7 +15,7 @@ gem 'coffee-rails', '= 3.2.2' gem 'uglifier', '= 1.2.3' gem 'jquery-rails', '= 3.1.0' gem 'jquery-ui-rails', '= 4.1.2' -gem 'json', '= 1.8.3' +gem 'json', '1.8.6' gem 'sinatra', '= 1.3.2' gem 'selenium-webdriver', '= 2.44.0' gem 'god', :git => 'https://github.com/mojombo/god.git', :ref => '92c06aa5f6293cf26498a306e9bb7ac856d7dca0' diff --git a/Gemfile.lock b/Gemfile.lock index cd0857e72..33d0c18be 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -276,7 +276,7 @@ GEM jquery-ui-rails (4.1.2) railties (>= 3.1.0) jruby-pageant (1.1.1) - json (1.8.3) + json (1.8.6) jwt (1.4.1) kaminari (0.13.0) actionpack (>= 3.0.0) @@ -513,7 +513,7 @@ DEPENDENCIES hashie (= 2.1.2) jquery-rails (= 3.1.0) jquery-ui-rails (= 4.1.2) - json (= 1.8.3) + json (= 1.8.6) jwt (= 1.4.1) mailboxer (= 0.10.3) net-ssh (= 2.4.0)