diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-05-30 12:37:38 +0000 |
|---|---|---|
| committer | Timothy Andrew <mail@timothyandrew.net> | 2017-06-21 05:00:23 +0000 |
| commit | c8ab22d0e4bc16209aa10a09cd52db778bf0b2df (patch) | |
| tree | 2df93c66ea4e6c80b2554b6c8904c43e4877fe8c | |
| parent | 25b9d8e550ed97fd492b549c1a6e544e2445c77a (diff) | |
| download | gitlab-ce-c8ab22d0e4bc16209aa10a09cd52db778bf0b2df.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 c0c56aa9602..09a525aea60 100644 --- 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 |