diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-05-25 15:18:19 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-05-25 15:18:19 +0000 |
| commit | f0f63b79f4791294603550921b68bf070fc84aff (patch) | |
| tree | a727de895e59207c69009c3bfd40c315548249bb | |
| parent | b07771683d611d16d08a6a316e0966bf42cd0c88 (diff) | |
| parent | c2ad6c8f5f6212672298f03ab8f67bc1d2c03bbd (diff) | |
| download | gitlab-ce-f0f63b79f4791294603550921b68bf070fc84aff.tar.gz | |
Merge branch 'authentiq-gem-update' into 'master'
Authentiq gem update
See merge request gitlab-org/gitlab-ce!19137
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 9 |
2 files changed, 6 insertions, 5 deletions
@@ -50,7 +50,7 @@ gem 'omniauth-saml', '~> 1.10' gem 'omniauth-shibboleth', '~> 1.2.0' gem 'omniauth-twitter', '~> 1.4' gem 'omniauth_crowd', '~> 2.2.0' -gem 'omniauth-authentiq', '~> 0.3.1' +gem 'omniauth-authentiq', '~> 0.3.3' gem 'rack-oauth2', '~> 1.2.1' gem 'jwt', '~> 1.5.6' diff --git a/Gemfile.lock b/Gemfile.lock index 9c2ef9dfa91..476da021a9d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -529,8 +529,9 @@ GEM rack (>= 1.6.2, < 3) omniauth-auth0 (2.0.0) omniauth-oauth2 (~> 1.4) - omniauth-authentiq (0.3.1) - omniauth-oauth2 (~> 1.3, >= 1.3.1) + omniauth-authentiq (0.3.3) + jwt (>= 1.5) + omniauth-oauth2 (>= 1.5) omniauth-azure-oauth2 (0.0.9) jwt (~> 1.0) omniauth (~> 1.0) @@ -1092,7 +1093,7 @@ DEPENDENCIES octokit (~> 4.8) omniauth (~> 1.8) omniauth-auth0 (~> 2.0.0) - omniauth-authentiq (~> 0.3.1) + omniauth-authentiq (~> 0.3.3) omniauth-azure-oauth2 (~> 0.0.9) omniauth-cas3 (~> 1.1.4) omniauth-facebook (~> 4.0.0) @@ -1197,4 +1198,4 @@ DEPENDENCIES wikicloth (= 0.8.1) BUNDLED WITH - 1.16.1 + 1.16.2 |