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

[rails.git] / Gemfile.lock

diff --git a/Gemfile.lock b/Gemfile.lock
index 7642812850d5d92a338f1a55a1e756a8a06688bf..a34976cd6631895ac968ba41bb158ce4aad8c028 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -362,11 +362,6 @@ GEM
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oauth (0.4.7)
-    oauth-plugin (0.5.1)
-      multi_json
-      oauth (~> 0.4.4)
-      oauth2 (>= 0.5.0)
-      rack
     oauth2 (2.0.9)
       faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
@@ -672,8 +667,8 @@ DEPENDENCIES
   mini_racer (~> 0.9.0)
   minitest (~> 5.1)
   minitest-focus
+  multi_json
   multi_xml (~> 0.6.0)
-  oauth-plugin (>= 0.5.1)
   omniauth (~> 2.0.2)
   omniauth-facebook
   omniauth-github