Merge remote-tracking branch 'upstream/pull/4169'

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index b75e9360678aa89124b6ee8d7f5ce5558c77a796..774803788ecb712f5620c167d143482a1fc9d667 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -348,6 +348,9 @@ GEM
     omniauth-mediawiki (0.0.4)
       jwt (~> 2.0)
       omniauth-oauth (~> 1.0)
     omniauth-mediawiki (0.0.4)
       jwt (~> 2.0)
       omniauth-oauth (~> 1.0)

+    omniauth-microsoft_graph (1.2.0)
+      omniauth (~> 2.0)
+      omniauth-oauth2 (~> 1.8.0)

     omniauth-oauth (1.2.0)
       oauth
       omniauth (>= 1.0, < 3)
     omniauth-oauth (1.2.0)
       oauth
       omniauth (>= 1.0, < 3)


@@ -360,9 +363,6 @@ GEM
     omniauth-rails_csrf_protection (1.0.1)
       actionpack (>= 4.2)
       omniauth (~> 2.0)
     omniauth-rails_csrf_protection (1.0.1)
       actionpack (>= 4.2)
       omniauth (~> 2.0)

-    omniauth-windowslive (0.0.12)
-      multi_json (~> 1.12)
-      omniauth-oauth2 (~> 1.4)

     openstreetmap-deadlock_retry (1.3.1)
     parallel (1.23.0)
     parser (3.2.2.3)
     openstreetmap-deadlock_retry (1.3.1)
     parallel (1.23.0)
     parser (3.2.2.3)


@@ -372,7 +372,7 @@ GEM
     popper_js (2.11.8)
     progress (3.6.0)
     public_suffix (5.0.3)
     popper_js (2.11.8)
     progress (3.6.0)
     public_suffix (5.0.3)

-    puma (5.6.6)
+    puma (5.6.7)

       nio4r (~> 2.0)
     quad_tile (1.0.1)
     r2 (0.2.8)
       nio4r (~> 2.0)
     quad_tile (1.0.1)
     r2 (0.2.8)


@@ -595,9 +595,9 @@ DEPENDENCIES
   omniauth-github
   omniauth-google-oauth2 (>= 0.6.0)
   omniauth-mediawiki (>= 0.0.4)
   omniauth-github
   omniauth-google-oauth2 (>= 0.6.0)
   omniauth-mediawiki (>= 0.0.4)

+  omniauth-microsoft_graph

   omniauth-openid
   omniauth-rails_csrf_protection (~> 1.0)
   omniauth-openid
   omniauth-rails_csrf_protection (~> 1.0)

-  omniauth-windowslive

   openstreetmap-deadlock_retry (>= 1.3.1)
   pg
   puma (~> 5.6)
   openstreetmap-deadlock_retry (>= 1.3.1)
   pg
   puma (~> 5.6)