summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-09-07 11:52:26 +0200
committerRémy Coutable <remy@rymai.me>2017-09-07 11:52:26 +0200
commita11b1926b7a363f0d370f4f2bb7b4cba4003d854 (patch)
tree14505aa3cf9a6333252de17fb6a5b68ea89bfa58
parent424c46731018f0232e2b6341f474100cb185c05a (diff)
downloadgitlab-ce-a11b1926b7a363f0d370f4f2bb7b4cba4003d854.tar.gz
Update the omniauth-google-oauth2 gem to 0.5.237411-update-omniauth-google-oauth2
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock6
2 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile b/Gemfile
index 2ebc01d8a15..0602560c42d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -31,7 +31,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.4.1'
+gem 'omniauth-google-oauth2', '~> 0.5.2'
gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
gem 'omniauth-oauth2-generic', '~> 0.2.2'
gem 'omniauth-saml', '~> 1.7.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index f7ae8bddd6d..63493482258 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -530,8 +530,8 @@ GEM
omniauth-gitlab (1.0.2)
omniauth (~> 1.0)
omniauth-oauth2 (~> 1.0)
- omniauth-google-oauth2 (0.4.1)
- jwt (~> 1.5.2)
+ omniauth-google-oauth2 (0.5.2)
+ jwt (~> 1.5)
multi_json (~> 1.3)
omniauth (>= 1.1.1)
omniauth-oauth2 (>= 1.3.1)
@@ -1076,7 +1076,7 @@ DEPENDENCIES
omniauth-facebook (~> 4.0.0)
omniauth-github (~> 1.1.1)
omniauth-gitlab (~> 1.0.2)
- omniauth-google-oauth2 (~> 0.4.1)
+ omniauth-google-oauth2 (~> 0.5.2)
omniauth-kerberos (~> 0.3.0)
omniauth-oauth2-generic (~> 0.2.2)
omniauth-saml (~> 1.7.0)