X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6852bc9c9255aca49da991d295c2b8c5555a3db9..81fb26d840767e04d364a0a24d186e1a35ab4b5f:/Gemfile.lock?ds=sidebyside diff --git a/Gemfile.lock b/Gemfile.lock index dd6ddfc88..147ab83e5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -221,17 +221,14 @@ GEM image_size (2.0.2) in_threads (1.5.3) jaro_winkler (1.5.4) + jbuilder (2.9.1) + activesupport (>= 4.2.0) jmespath (1.4.0) jquery-rails (4.3.5) rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (2.2.0) - jsonify (0.3.1) - multi_json (~> 1.0) - jsonify-rails (0.3.2) - actionpack - jsonify (< 0.4.0) jwt (2.2.1) kgio (2.11.2) kramdown (2.1.0) @@ -478,9 +475,9 @@ DEPENDENCIES http_accept_language (~> 2.0.0) i18n-js (>= 3.0.0) image_optim_rails + jbuilder (~> 2.7) jquery-rails json - jsonify-rails kgio kramdown libxml-ruby (>= 2.0.5)