X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/97bf1b303c3ae40261aa236009b356b369968a03..8937099429ef3e30e3431aebc8d8baf266fc3ce8:/Gemfile.lock diff --git a/Gemfile.lock b/Gemfile.lock index 3b8ab41f4..36e6ae9dd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -117,10 +117,13 @@ GEM factory_bot_rails (4.11.1) factory_bot (~> 4.11.1) railties (>= 3.0.0) + fakefs (0.18.1) faraday (0.15.4) 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,8 +162,9 @@ GEM jsonify-rails (0.3.2) actionpack jsonify (< 0.4.0) - jwt (1.5.6) + jwt (2.1.0) kgio (2.11.2) + kramdown (1.17.0) libv8 (3.16.14.19) libxml-ruby (3.1.0) listen (3.1.5) @@ -187,7 +191,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 +220,12 @@ GEM omniauth-github (1.3.0) omniauth (~> 1.5) omniauth-oauth2 (>= 1.4.0, < 2.0) - omniauth-google-oauth2 (0.5.3) - 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 @@ -303,7 +307,6 @@ GEM ffi (~> 1.0) record_tag_helper (1.0.0) actionview (~> 5.x) - redcarpet (3.4.0) ref (2.0.0) request_store (1.4.1) rack (>= 1.4) @@ -401,7 +404,9 @@ DEPENDENCIES delayed_job_active_record dynamic_form factory_bot_rails + fakefs faraday + gd2-ffij geoip htmlentities http_accept_language (~> 2.0.0) @@ -412,6 +417,7 @@ DEPENDENCIES json jsonify-rails kgio + kramdown libxml-ruby (>= 2.0.5) listen logstasher @@ -420,8 +426,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) @@ -438,7 +444,6 @@ DEPENDENCIES rails-controller-testing rails-i18n (~> 4.0.0) record_tag_helper - redcarpet rinku (>= 1.2.2) rotp rubocop