X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/a9a5b6ef38aeddcae590dfc53763ac303cadb8b0..0d3a9ed9cb47ce3b89ea9eaffbb589f9a9ff6d22:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index 6f2e73d43..158694564 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -58,10 +58,15 @@ GEM i18n (0.6.0) iconv (0.1) journey (1.0.4) - jquery-rails (2.1.0) + jquery-rails (2.1.1) railties (>= 3.1.0, < 5.0) thor (~> 0.14) json (1.7.5) + jsonify (0.3.1) + multi_json (~> 1.0) + jsonify-rails (0.3.2) + actionpack + jsonify (< 0.4.0) jwt (0.1.5) multi_json (>= 1.0) libv8 (3.3.10.4) @@ -171,6 +176,7 @@ DEPENDENCIES httpclient iconv jquery-rails + jsonify-rails libxml-ruby (>= 2.0.5) memcached (>= 1.4.1) minitest