diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-16 15:09:35 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-09-16 15:09:35 +0300 |
| commit | 4c16d4ff4f92987f609e9853da5900a51f0ad1be (patch) | |
| tree | 3ebc97c31f90db2f9c8fe4e5c5f33a502d68363d /Gemfile.lock | |
| parent | 3b85f5e4a123538b14eb052ae0efb9d7dbcd4e9b (diff) | |
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 87f78455ee0..007694e6c28 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -657,7 +657,7 @@ GEM character_set (~> 1.4) regexp_parser (~> 2.1) regexp_property_values (~> 1.0) - json (2.3.0) + json (2.5.1) json-jwt (1.13.0) activesupport (>= 4.2) aes_key_wrap @@ -1509,7 +1509,7 @@ DEPENDENCIES ipaddress (~> 0.8.3) jira-ruby (~> 2.1.4) js_regex (~> 3.7) - json (~> 2.3.0) + json (~> 2.5.1) json_schemer (~> 0.2.18) jwt (~> 2.1.0) kaminari (~> 1.0) |