diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-26 14:52:16 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-08-26 14:52:16 +0000 |
| commit | 29372e8623bde76fbaf4cf38441aa8b437ab687d (patch) | |
| tree | 23d357fd2015946eab154277eb1484efd9415e22 | |
| parent | 68acc453afc364674f94b32888d401b9a540a4b3 (diff) | |
| download | gitlab-ce-29372e8623bde76fbaf4cf38441aa8b437ab687d.tar.gz | |
Add latest changes from gitlab-org/security/gitlab@15-2-stable-ee
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | Gemfile.lock | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -538,7 +538,7 @@ gem 'json', '~> 2.5.1' gem 'json_schemer', '~> 0.2.18' gem 'oj', '~> 3.13.19' gem 'multi_json', '~> 1.14.1' -gem 'yajl-ruby', '~> 1.4.1', require: 'yajl' +gem 'yajl-ruby', '~> 1.4.3', require: 'yajl' gem 'webauthn', '~> 2.3' diff --git a/Gemfile.lock b/Gemfile.lock index 718bcfcac9a..d9dd012a822 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1467,7 +1467,7 @@ GEM xml-simple (1.1.5) xpath (3.2.0) nokogiri (~> 1.8) - yajl-ruby (1.4.1) + yajl-ruby (1.4.3) yard (0.9.26) zeitwerk (2.6.0) @@ -1765,7 +1765,7 @@ DEPENDENCIES webmock (~> 3.9.1) webrick (~> 1.6.1) wikicloth (= 0.8.1) - yajl-ruby (~> 1.4.1) + yajl-ruby (~> 1.4.3) BUNDLED WITH 2.3.15 |