summaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorMarkus Koller <markus.koller.ext@siemens.com>2018-06-13 22:32:21 +0200
committerMarkus Koller <markus.koller.ext@siemens.com>2018-06-28 15:31:47 +0200
commit904b6dd0834868ec260f40077623463926114373 (patch)
tree0b8070ec9c13908bfd9e72b3c832641b71a86340 /Gemfile.lock
parentf63e234b57e07e2020f9698f48c9515905d4b6a3 (diff)
downloadgitlab-ce-904b6dd0834868ec260f40077623463926114373.tar.gz
Don't hash user ID in OIDC subject claim
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock12
1 files changed, 4 insertions, 8 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 13f9212c637..79e3888fa64 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -171,7 +171,7 @@ GEM
unf (>= 0.0.5, < 1.0.0)
doorkeeper (4.3.2)
railties (>= 4.2)
- doorkeeper-openid_connect (1.4.0)
+ doorkeeper-openid_connect (1.5.0)
doorkeeper (~> 4.3)
json-jwt (~> 1.6)
dropzonejs-rails (0.7.2)
@@ -427,12 +427,10 @@ GEM
oauth (~> 0.5, >= 0.5.0)
jquery-atwho-rails (1.3.2)
json (1.8.6)
- json-jwt (1.9.2)
+ json-jwt (1.9.4)
activesupport
aes_key_wrap
bindata
- securecompare
- url_safe_base64
json-schema (2.8.0)
addressable (>= 2.4)
jwt (1.5.6)
@@ -512,7 +510,7 @@ GEM
net-ldap (0.16.0)
net-ssh (5.0.1)
netrc (0.11.0)
- nokogiri (1.8.2)
+ nokogiri (1.8.3)
mini_portile2 (~> 2.3.0)
nokogumbo (1.5.0)
nokogiri
@@ -827,7 +825,6 @@ GEM
scss_lint (0.56.0)
rake (>= 0.9, < 13)
sass (~> 3.5.3)
- securecompare (1.0.0)
seed-fu (2.3.7)
activerecord (>= 3.1)
activesupport (>= 3.1)
@@ -939,7 +936,6 @@ GEM
equalizer (~> 0.0.9)
parser (>= 2.3.1.2, < 2.6)
procto (~> 0.0.2)
- url_safe_base64 (0.2.2)
validates_hostname (1.0.6)
activerecord (>= 3.0)
activesupport (>= 3.0)
@@ -1013,7 +1009,7 @@ DEPENDENCIES
devise-two-factor (~> 3.0.0)
diffy (~> 3.1.0)
doorkeeper (~> 4.3)
- doorkeeper-openid_connect (~> 1.3)
+ doorkeeper-openid_connect (~> 1.5)
dropzonejs-rails (~> 0.7.1)
ed25519 (~> 1.2)
email_reply_trimmer (~> 0.1)