summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2018-12-28 22:56:33 -0800
committerStan Hu <stanhu@gmail.com>2018-12-28 23:23:14 -0800
commit3648e280baa04112ab0052d991d1f16e86499a5b (patch)
treeae36d77eb4f374a84ff2e450f393357241b86902 /Gemfile
parente962baf4417e59cbb2ef8621ef0662f93f180f92 (diff)
downloadgitlab-ce-3648e280baa04112ab0052d991d1f16e86499a5b.tar.gz
Upgrade Omniauth and JWT gems to switch away from Google+ API
* omniauth-google-oauth2: Google will be deprecating its support for the Google+ API, which currently omniauth-google-oauth2 uses to retrieve user info. The bump in omniauth-google-oauth2 requires an upgrade to ruby-jwt v2+ to support the verification of multiple issue providers (https://github.com/zquestz/omniauth-google-oauth2/pull/345). * jwt: This has the most number of changes that need to be reviewed: https://github.com/jwt/ruby-jwt/blob/master/CHANGELOG.md * oauth2: Needed to support ruby-jwt v2+: https://github.com/oauth-xx/oauth2/blob/master/CHANGELOG.md * omniauth-azure-oauth2 needs a version bump to support ruby-jwt v2+. * omniauth: This version bump only involves backstage improvements: https://github.com/omniauth/omniauth/releases Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55668
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile b/Gemfile
index c316f3b0e5f..a79276da066 100644
--- a/Gemfile
+++ b/Gemfile
@@ -34,7 +34,7 @@ gem 'omniauth-cas3', '~> 1.1.4'
gem 'omniauth-facebook', '~> 4.0.0'
gem 'omniauth-github', '~> 1.3'
gem 'omniauth-gitlab', '~> 1.0.2'
-gem 'omniauth-google-oauth2', '~> 0.5.3'
+gem 'omniauth-google-oauth2', '~> 0.6.0'
gem 'omniauth-kerberos', '~> 0.3.0', group: :kerberos
gem 'omniauth-oauth2-generic', '~> 0.2.2'
gem 'omniauth-saml', '~> 1.10'
@@ -43,7 +43,7 @@ gem 'omniauth-twitter', '~> 1.4'
gem 'omniauth_crowd', '~> 2.2.0'
gem 'omniauth-authentiq', '~> 0.3.3'
gem 'rack-oauth2', '~> 1.2.1'
-gem 'jwt', '~> 1.5.6'
+gem 'jwt', '~> 2.1.0'
# Spam and anti-bot protection
gem 'recaptcha', '~> 3.0', require: 'recaptcha/rails'