X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/cb5e6ebfaaa6e4b89ae259f502a6a3b2bc716d05..e660e609661edadc1ed5ad49d6e83e936b2f91cd:/Gemfile.lock?ds=sidebyside diff --git a/Gemfile.lock b/Gemfile.lock index 4709cd195..e212d1003 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -61,9 +61,14 @@ GEM railties (>= 3.2.0, < 5.0) thor (~> 0.14) json (1.6.5) + jsonify (0.3.1) + multi_json (~> 1.0) + jsonify-rails (0.3.1) + actionpack + jsonify (>= 0.3.1) libv8 (3.3.10.4) libxml-ruby (2.2.2) - mail (2.4.1) + mail (2.4.3) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) @@ -91,7 +96,7 @@ GEM pg (0.13.2) polyglot (0.3.3) rack (1.4.1) - rack-cache (1.1) + rack-cache (1.2) rack (>= 0.4) rack-openid (1.3.1) rack (>= 1.1.0) @@ -141,7 +146,7 @@ GEM treetop (1.4.10) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.31) + tzinfo (0.3.32) uglifier (1.2.3) execjs (>= 0.3.0) multi_json (>= 1.0.2) @@ -160,6 +165,7 @@ DEPENDENCIES httpclient iconv jquery-rails + jsonify-rails libxml-ruby (>= 2.0.5) memcached (>= 1.4.1) oauth-plugin (>= 0.4.0.pre7)