summaryrefslogtreecommitdiff
path: root/Gemfile
diff options
context:
space:
mode:
authorAsh McKenzie <amckenzie@gitlab.com>2019-05-06 08:29:39 +0000
committerAsh McKenzie <amckenzie@gitlab.com>2019-05-06 08:29:39 +0000
commit8b55b794cb48c726cde7cf0ad24180d8e6bb975f (patch)
treea0d30241a9703e611c188197661b398c3aea21b9 /Gemfile
parentf741a7dd3258f2f0d19d8e95642d35934ca59a36 (diff)
parent6018d5bb87a09a4e624983a3bfbb2e573fbb0dd9 (diff)
downloadgitlab-ce-8b55b794cb48c726cde7cf0ad24180d8e6bb975f.tar.gz
Merge branch 'feature/omniauth_oidc_strategy' into 'master'
Added Omniauth OpenID Connect strategy See merge request gitlab-org/gitlab-ce!27383
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index dcfb3a81274..1282ff0e20d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -41,8 +41,9 @@ gem 'omniauth-shibboleth', '~> 1.3.0'
gem 'omniauth-twitter', '~> 1.4'
gem 'omniauth_crowd', '~> 2.2.0'
gem 'omniauth-authentiq', '~> 0.3.3'
+gem 'omniauth_openid_connect', '~> 0.3.0'
+gem "omniauth-ultraauth", '~> 0.0.2'
gem 'rack-oauth2', '~> 1.9.3'
-gem "omniauth-ultraauth", '~> 0.0.1'
gem 'jwt', '~> 2.1.0'
# Spam and anti-bot protection