diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-05 21:07:31 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-05 21:07:31 +0000 |
| commit | 4ea38e4ca188f185d7d2adea6c5ab4fd1aa8498e (patch) | |
| tree | 94b3d4f532615eabe245800941401cd3ae464960 /Gemfile.lock | |
| parent | 23a669817e28092b22994338f22a1e4b3823424d (diff) | |
| download | gitlab-ce-4ea38e4ca188f185d7d2adea6c5ab4fd1aa8498e.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 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) |