summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-05-30 11:22:46 +0200
committerRémy Coutable <remy@rymai.me>2017-05-30 11:22:46 +0200
commitb60a14357f443445771ce486bc498188545cd62e (patch)
tree7715bcad396a7269daca5c280f53945161fd1111 /Gemfile.lock
parentf47e86feaa91d4ba1b268c56dd0a488c7092b573 (diff)
downloadgitlab-ce-b60a14357f443445771ce486bc498188545cd62e.tar.gz
Fix omniauth-google-oauth2 dependencies in Gemfile.lock32653-fix-gemfile-lock
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock7
1 files changed, 3 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index dd2c85052f3..b3968d58ed0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -499,11 +499,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)
@@ -1060,4 +1059,4 @@ DEPENDENCIES
wikicloth (= 0.8.1)
BUNDLED WITH
- 1.14.6
+ 1.15.0