diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-01-01 08:27:53 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-01-01 08:27:53 +0000 |
| commit | 594bcf37af438d972adffc025a2d6c7227581824 (patch) | |
| tree | 13ef7f5045927a94c40109a1a7fb6d7512716dab /Gemfile | |
| parent | eab7e3c8b9bc267d6c1f1ed883d32679b12544f3 (diff) | |
| parent | c6d7130f65e89f659ffd905d8b3b6be4df91a0e2 (diff) | |
| download | gitlab-ce-594bcf37af438d972adffc025a2d6c7227581824.tar.gz | |
Merge branch 'sh-bump-omniauth-google-gem' into 'master'
Upgrade Omniauth and JWT gems to switch away from Google+ API
Closes #55668
See merge request gitlab-org/gitlab-ce!24068
Diffstat (limited to 'Gemfile')
| -rw-r--r-- | Gemfile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -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' |