Add latest changes from gitlab-org/gitlab@master

4ea38e4c · GitLab Bot · 23a66981 · 4ea38e4c · 4ea38e4c
Commit 4ea38e4c authored Jan 05, 2020 by GitLab Bot
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

Gemfile.lock Gemfile.lock +2 -2

changelogs/unreleased/sh-bump-json-jwt.yml changelogs/unreleased/sh-bump-json-jwt.yml +5 -0

No files found.
--- 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)

--- a/changelogs/unreleased/sh-bump-json-jwt.yml
+++ b/changelogs/unreleased/sh-bump-json-jwt.yml
+---
+title: Upgrade json-jwt to v1.11.0
+merge_request: 22440
+author:
+type: security