diff options
| author | Rémy Coutable <remy@rymai.me> | 2016-12-21 11:58:05 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2016-12-21 11:58:05 +0000 |
| commit | 0ba41ea1c8e9d99667401c2778c7c320b96c35e0 (patch) | |
| tree | 9f887505f6e97ebb7b8de939e9227a6b950484f6 /Gemfile.lock | |
| parent | 0ad0aa42eb9c1b51a406173438b686458d9dc87e (diff) | |
| parent | 6e186b76bb22c5803e3d7105f8ff78c11128812d (diff) | |
| download | gitlab-ce-0ba41ea1c8e9d99667401c2778c7c320b96c35e0.tar.gz | |
Merge branch 'authentiq-id-oauth-support' into 'master'
Added support for Authentiq OAuth provider
See merge request !8038
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 8bc22479346..9f8367b420a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -428,6 +428,8 @@ GEM rack (>= 1.0, < 3) omniauth-auth0 (1.4.1) omniauth-oauth2 (~> 1.1) + omniauth-authentiq (0.2.2) + omniauth-oauth2 (~> 1.3, >= 1.3.1) omniauth-azure-oauth2 (0.0.6) jwt (~> 1.0) omniauth (~> 1.0) @@ -897,6 +899,7 @@ DEPENDENCIES oj (~> 2.17.4) omniauth (~> 1.3.1) omniauth-auth0 (~> 1.4.1) + omniauth-authentiq (~> 0.2.0) omniauth-azure-oauth2 (~> 0.0.6) omniauth-cas3 (~> 1.1.2) omniauth-facebook (~> 4.0.0) |