X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/b28e3052b0dc11ea5d1e39d53adc6f6fbbe20764..3b96bbc80976836c6783ddd81db2f93b7e3fa3a2:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index 5aef4dc0e..df455ef9f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -121,6 +121,8 @@ GEM multipart-post (>= 1.2, < 3) ffi (1.9.25) fspath (3.1.0) + gd2-ffij (0.3.0) + ffi (>= 1.0.0) geoip (1.6.4) globalid (0.4.1) activesupport (>= 4.2.0) @@ -159,7 +161,7 @@ GEM jsonify-rails (0.3.2) actionpack jsonify (< 0.4.0) - jwt (1.5.6) + jwt (2.1.0) kgio (2.11.2) libv8 (3.16.14.19) libxml-ruby (3.1.0) @@ -187,7 +189,7 @@ GEM mini_mime (1.0.1) mini_portile2 (2.4.0) minitest (5.11.3) - msgpack (1.2.4) + msgpack (1.2.6) multi_json (1.13.1) multi_xml (0.6.0) multipart-post (2.0.0) @@ -216,12 +218,12 @@ GEM omniauth-github (1.3.0) omniauth (~> 1.5) omniauth-oauth2 (>= 1.4.0, < 2.0) - omniauth-google-oauth2 (0.5.4) - jwt (>= 1.5) + omniauth-google-oauth2 (0.6.0) + jwt (>= 2.0) omniauth (>= 1.1.1) omniauth-oauth2 (>= 1.5) - omniauth-mediawiki (0.0.3) - jwt (~> 1.0) + omniauth-mediawiki (0.0.4) + jwt (~> 2.0) omniauth-oauth (~> 1.0) omniauth-oauth (1.1.0) oauth @@ -402,6 +404,7 @@ DEPENDENCIES dynamic_form factory_bot_rails faraday + gd2-ffij geoip htmlentities http_accept_language (~> 2.0.0) @@ -420,8 +423,8 @@ DEPENDENCIES omniauth omniauth-facebook omniauth-github - omniauth-google-oauth2 (>= 0.2.7) - omniauth-mediawiki (>= 0.0.3) + omniauth-google-oauth2 (>= 0.6.0) + omniauth-mediawiki (>= 0.0.4) omniauth-openid omniauth-windowslive openstreetmap-deadlock_retry (>= 1.3.0)