X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d68368e0d571ae6b953e0f3900e3f4c304076769..129d505d9117ad05abe6bbc4d1936fd9b6f7bc2a:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index 7292a7141..eafd5d341 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -64,6 +64,11 @@ GEM 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) @@ -74,7 +79,7 @@ GEM treetop (~> 1.4.8) memcached (1.4.6) mime-types (1.19) - minitest (4.2.0) + minitest (4.3.0) multi_json (1.3.7) multipart-post (1.1.5) nokogiri (1.5.5) @@ -129,7 +134,7 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (10.0.0) + rake (10.0.2) rdoc (3.12) json (~> 1.4) redcarpet (2.2.2) @@ -178,6 +183,7 @@ DEPENDENCIES i18n-js (>= 3.0.0.rc2) iconv jquery-rails + jsonify-rails libxml-ruby (>= 2.0.5) memcached (>= 1.4.1) minitest