summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-10 06:06:31 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-10 06:06:31 +0000
commit71d998ca0de672d5accdf209b4b5e3f360ea5267 (patch)
tree3b4cf166284b24bd4d52483244a569f4eb6da80f
parentd5f38aabd6b3bf03ed5506eb269062750bc60399 (diff)
downloadgitlab-ce-71d998ca0de672d5accdf209b4b5e3f360ea5267.tar.gz
Add latest changes from gitlab-org/gitlab@master
-rw-r--r--Gemfile2
-rw-r--r--Gemfile.lock8
-rw-r--r--changelogs/unreleased/sh-update-openid-connect.yml5
3 files changed, 10 insertions, 5 deletions
diff --git a/Gemfile b/Gemfile
index 25c9fbc43ab..4c077e71397 100644
--- a/Gemfile
+++ b/Gemfile
@@ -42,7 +42,7 @@ 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.1'
+gem 'omniauth_openid_connect', '~> 0.3.3'
gem "omniauth-ultraauth", '~> 0.0.2'
gem 'omniauth-salesforce', '~> 1.0.5'
gem 'rack-oauth2', '~> 1.9.3'
diff --git a/Gemfile.lock b/Gemfile.lock
index 4eac23b7a71..5031007ef1d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -675,12 +675,12 @@ GEM
activesupport
nokogiri (>= 1.4.4)
omniauth (~> 1.0)
- omniauth_openid_connect (0.3.1)
+ omniauth_openid_connect (0.3.3)
addressable (~> 2.5)
- omniauth (~> 1.3)
+ omniauth (~> 1.9)
openid_connect (~> 1.1)
open4 (1.3.4)
- openid_connect (1.1.6)
+ openid_connect (1.1.8)
activemodel
attr_required (>= 1.0.0)
json-jwt (>= 1.5.0)
@@ -1245,7 +1245,7 @@ DEPENDENCIES
omniauth-twitter (~> 1.4)
omniauth-ultraauth (~> 0.0.2)
omniauth_crowd (~> 2.2.0)
- omniauth_openid_connect (~> 0.3.1)
+ omniauth_openid_connect (~> 0.3.3)
org-ruby (~> 0.9.12)
pg (~> 1.1)
premailer-rails (~> 1.9.7)
diff --git a/changelogs/unreleased/sh-update-openid-connect.yml b/changelogs/unreleased/sh-update-openid-connect.yml
new file mode 100644
index 00000000000..34341b6a385
--- /dev/null
+++ b/changelogs/unreleased/sh-update-openid-connect.yml
@@ -0,0 +1,5 @@
+---
+title: Update omniauth_openid_connect to v0.3.3
+merge_request: 19525
+author:
+type: fixed