summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-07-19 12:16:58 +0000
committerRémy Coutable <remy@rymai.me>2017-07-19 12:16:58 +0000
commit0579a89fb9aa93918760b2dd3eb6b7ae0eeea739 (patch)
tree0affe7f35a624b21194148e0606877dbec93c179 /Gemfile.lock
parent312ed3f9a458ba76a738cf75da8e07954cedecdd (diff)
parent6bd94f20e30dfcba5273cd6e7415fb90914ab5a7 (diff)
downloadgitlab-ce-0579a89fb9aa93918760b2dd3eb6b7ae0eeea739.tar.gz
Merge branch 'authentiq-updates' into 'master'
Added authentiq provider to tests and updated documentation, gem and config file. See merge request !12952
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock4
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 69e4c4416ba..52409000d3f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -488,7 +488,7 @@ GEM
rack (>= 1.0, < 3)
omniauth-auth0 (1.4.1)
omniauth-oauth2 (~> 1.1)
- omniauth-authentiq (0.3.0)
+ omniauth-authentiq (0.3.1)
omniauth-oauth2 (~> 1.3, >= 1.3.1)
omniauth-azure-oauth2 (0.0.6)
jwt (~> 1.0)
@@ -1015,7 +1015,7 @@ DEPENDENCIES
oj (~> 2.17.4)
omniauth (~> 1.4.2)
omniauth-auth0 (~> 1.4.1)
- omniauth-authentiq (~> 0.3.0)
+ omniauth-authentiq (~> 0.3.1)
omniauth-azure-oauth2 (~> 0.0.6)
omniauth-cas3 (~> 1.1.2)
omniauth-facebook (~> 4.0.0)