diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-06 00:07:31 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-06 00:07:31 +0300 |
| commit | 4ea38e4ca188f185d7d2adea6c5ab4fd1aa8498e (patch) | |
| tree | 94b3d4f532615eabe245800941401cd3ae464960 | |
| parent | 23a669817e28092b22994338f22a1e4b3823424d (diff) | |
Add latest changes from gitlab-org/gitlab@master
| -rw-r--r-- | Gemfile.lock | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-bump-json-jwt.yml | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 15ceff6e868..24d321cccb1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -532,8 +532,8 @@ GEM regexp_parser (~> 1.1) regexp_property_values (~> 0.3) json (1.8.6) - json-jwt (1.9.4) - activesupport + json-jwt (1.11.0) + activesupport (>= 4.2) aes_key_wrap bindata json-schema (2.8.0) diff --git a/changelogs/unreleased/sh-bump-json-jwt.yml b/changelogs/unreleased/sh-bump-json-jwt.yml new file mode 100644 index 00000000000..afa8c8bbf20 --- /dev/null +++ b/changelogs/unreleased/sh-bump-json-jwt.yml @@ -0,0 +1,5 @@ +--- +title: Upgrade json-jwt to v1.11.0 +merge_request: 22440 +author: +type: security |