diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-10-06 09:23:23 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-10-06 09:23:23 +0000 |
| commit | de035a0d5e310b99d5ae3c2dd74949897377d8a1 (patch) | |
| tree | 6d4cdc323fc0e6a530d15c20832936e7dd687408 /Gemfile.lock | |
| parent | e3ff410152edbd0ac2c5bba3e69b3eefaee3aac7 (diff) | |
| parent | 26eadca48cc58e53e5e060efe6424f63377c7663 (diff) | |
| download | gitlab-ce-de035a0d5e310b99d5ae3c2dd74949897377d8a1.tar.gz | |
Merge branch 'fix/update-doorkeeper-openid-connect' into 'master'
Upgrade doorkeeper-openid_connect
See merge request gitlab-org/gitlab-ce!14372
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 4622fd141ba..6040596dda5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -80,7 +80,7 @@ GEM coderay (>= 1.0.0) erubis (>= 2.6.6) rack (>= 0.9.0) - bindata (2.3.5) + bindata (2.4.1) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) bootstrap-sass (3.3.6) @@ -166,9 +166,9 @@ GEM docile (1.1.5) domain_name (0.5.20161021) unf (>= 0.0.5, < 1.0.0) - doorkeeper (4.2.0) + doorkeeper (4.2.6) railties (>= 4.2) - doorkeeper-openid_connect (1.1.2) + doorkeeper-openid_connect (1.2.0) doorkeeper (~> 4.0) json-jwt (~> 1.6) dropzonejs-rails (0.7.2) @@ -410,7 +410,7 @@ GEM railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (1.8.6) - json-jwt (1.7.1) + json-jwt (1.7.2) activesupport bindata multi_json (>= 1.3) @@ -681,7 +681,7 @@ GEM rainbow (2.2.2) rake raindrops (0.18.0) - rake (12.0.0) + rake (12.1.0) rblineprof (0.3.6) debugger-ruby_core_source (~> 1.3) rbnacl (4.0.2) @@ -1002,7 +1002,7 @@ DEPENDENCIES devise-two-factor (~> 3.0.0) diffy (~> 3.1.0) doorkeeper (~> 4.2.0) - doorkeeper-openid_connect (~> 1.1.0) + doorkeeper-openid_connect (~> 1.2.0) dropzonejs-rails (~> 0.7.1) email_reply_trimmer (~> 0.1) email_spec (~> 1.6.0) |