Merge branch '32653-fix-gemfile-lock' into 'master'

Fix omniauth-google-oauth2 dependencies in Gemfile.lock Closes #32653 See merge request !11787

Merge branch '32653-fix-gemfile-lock' into 'master'
c8ab22d0 · Grzegorz Bizon · Timothy Andrew · 25b9d8e5 · c8ab22d0
Commit c8ab22d0 authored May 30, 2017 by Grzegorz Bizon Committed by Timothy Andrew Jun 21, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

Gemfile.lock Gemfile.lock +3 -4

No files found.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -497,11 +497,10 @@ GEM
      omniauth (~> 1.0)
      omniauth-oauth2 (~> 1.0)
    omniauth-google-oauth2 (0.4.1)
-      addressable (~> 2.3)
-      jwt (~> 1.0)
+      jwt (~> 1.5.2)
      multi_json (~> 1.3)
      omniauth (>= 1.1.1)
-      omniauth-oauth2 (~> 1.3.1)
+      omniauth-oauth2 (>= 1.3.1)
    omniauth-kerberos (0.3.0)
      omniauth-multipassword
      timfel-krb5-auth (~> 0.8)
@@ -1058,4 +1057,4 @@ DEPENDENCIES
  wikicloth (= 0.8.1)

 BUNDLED WITH
-   1.14.6
+   1.15.0