diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-03-28 20:21:26 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-03-28 20:21:26 +0300 |
| commit | b9d6232ff809fa3c2388b3a65ef8d7e8649108d3 (patch) | |
| tree | e7b543f450ffafbf5886a90a1224f944b67eca59 | |
| parent | 141748929dd006e4b506028e44e7dfdf3988c936 (diff) | |
| parent | 93313099c7c6685cda4d1f586c0b74891a877207 (diff) | |
Merge branch 'bump-omniauth-google-oauth2-gem-version' into 'master'
Bumps omniauth google oauth2 gem version
See merge request gitlab-org/gitlab-ce!18055
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 13 |
2 files changed, 7 insertions, 8 deletions
@@ -44,7 +44,7 @@ gem 'omniauth-cas3', '~> 1.1.4' gem 'omniauth-facebook', '~> 4.0.0' gem 'omniauth-github', '~> 1.1.1' gem 'omniauth-gitlab', '~> 1.0.2' -gem 'omniauth-google-oauth2', '~> 0.5.2' +gem 'omniauth-google-oauth2', '~> 0.5.3' gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos gem 'omniauth-oauth2-generic', '~> 0.2.2' gem 'omniauth-saml', '~> 1.10' diff --git a/Gemfile.lock b/Gemfile.lock index 5b61f3dbf67..cb21fcf8019 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -550,11 +550,10 @@ GEM omniauth-gitlab (1.0.2) omniauth (~> 1.0) omniauth-oauth2 (~> 1.0) - omniauth-google-oauth2 (0.5.2) - jwt (~> 1.5) - multi_json (~> 1.3) + omniauth-google-oauth2 (0.5.3) + jwt (>= 1.5) omniauth (>= 1.1.1) - omniauth-oauth2 (>= 1.3.1) + omniauth-oauth2 (>= 1.5) omniauth-jwt (0.0.2) jwt omniauth (~> 1.1) @@ -566,8 +565,8 @@ GEM omniauth-oauth (1.1.0) oauth omniauth (~> 1.0) - omniauth-oauth2 (1.4.0) - oauth2 (~> 1.0) + omniauth-oauth2 (1.5.0) + oauth2 (~> 1.1) omniauth (~> 1.2) omniauth-oauth2-generic (0.2.2) omniauth-oauth2 (~> 1.0) @@ -1118,7 +1117,7 @@ DEPENDENCIES omniauth-facebook (~> 4.0.0) omniauth-github (~> 1.1.1) omniauth-gitlab (~> 1.0.2) - omniauth-google-oauth2 (~> 0.5.2) + omniauth-google-oauth2 (~> 0.5.3) omniauth-jwt (~> 0.0.2) omniauth-kerberos (~> 0.3.0) omniauth-oauth2-generic (~> 0.2.2) |