diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-05-30 12:37:38 +0000 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-05-30 12:37:38 +0000 |
| commit | 1d5e5f754df345d7e3748bef4030b7210cff63c9 (patch) | |
| tree | 6efd4422ea1492d7a366669caa2b18a99c170450 | |
| parent | c5b0c530bf93e4525f8573dea14abd3f927b0f90 (diff) | |
| parent | b60a14357f443445771ce486bc498188545cd62e (diff) | |
| download | gitlab-ce-1d5e5f754df345d7e3748bef4030b7210cff63c9.tar.gz | |
Merge branch '32653-fix-gemfile-lock' into 'master'
Fix omniauth-google-oauth2 dependencies in Gemfile.lock
Closes #32653
See merge request !11787
| -rw-r--r-- | Gemfile.lock | 7 |
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 |