Merge e3896c9 into 1a986f6

y-yagi · Oct 15, 2018 · 2de8f1d · 2de8f1d
2 parents 1a986f6 + e3896c9
commit 2de8f1d
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -111,7 +111,7 @@ GEM
       exception_notification
       ruby-pushbullet
     execjs (2.7.0)
-    faraday (0.12.2)
+    faraday (0.15.3)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.25)
     garage-doorkeeper (2.0.0)
@@ -148,7 +148,7 @@ GEM
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     json (2.1.0)
-    jwt (1.5.6)
+    jwt (2.1.0)
     kaminari (1.1.1)
       activesupport (>= 4.1.0)
       kaminari-actionview (= 1.1.1)
@@ -196,9 +196,9 @@ GEM
     nokogiri (1.8.5)
       mini_portile2 (~> 2.3.0)
     oauth (0.5.4)
-    oauth2 (1.4.0)
-      faraday (>= 0.8, < 0.13)
-      jwt (~> 1.0)
+    oauth2 (1.4.1)
+      faraday (>= 0.8, < 0.16.0)
+      jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)