Merge branch 'oauth2-to-1-4-4-fixing-faraday-dependency-constraint' into 'master'

Update oauth2 to 1.4.4 fixing faraday constraint See merge request gitlab-org/gitlab!33999

Merge branch 'oauth2-to-1-4-4-fixing-faraday-dependency-constraint' into 'master'
Update oauth2 to 1.4.4 fixing faraday constraint See merge request gitlab-org/gitlab!33999
82e21e6a · Stan Hu · f09ca0b8 · e74d29e3 · 82e21e6a
Commit 82e21e6a authored Jun 05, 2020 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

Gemfile.lock Gemfile.lock +2 -2

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -662,8 +662,8 @@ GEM
      shellany (~> 0.0)
    numerizer (0.2.0)
    oauth (0.5.4)
-    oauth2 (1.4.1)
-      faraday (>= 0.8, < 0.16.0)
+    oauth2 (1.4.4)
+      faraday (>= 0.8, < 2.0)
      jwt (>= 1.0, < 3.0)
      multi_json (~> 1.3)
      multi_xml (~> 0.5)