diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-20 21:10:05 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-20 21:10:05 +0300 |
| commit | cc4e1c884cd6b8782fb6a247d840a2d1c7f4603e (patch) | |
| tree | 8a54c659b82873efafe04887708140785caea153 /lib/gitlab/background_migration | |
| parent | 709948b7a69597b1efe24df9b0f388cc0b493dd9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/background_migration')
| -rw-r--r-- | lib/gitlab/background_migration/fix_vulnerability_occurrences_with_hashes_as_raw_metadata.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/background_migration/fix_vulnerability_occurrences_with_hashes_as_raw_metadata.rb b/lib/gitlab/background_migration/fix_vulnerability_occurrences_with_hashes_as_raw_metadata.rb index 914ababa5c2..db3f98bc2ba 100644 --- a/lib/gitlab/background_migration/fix_vulnerability_occurrences_with_hashes_as_raw_metadata.rb +++ b/lib/gitlab/background_migration/fix_vulnerability_occurrences_with_hashes_as_raw_metadata.rb @@ -68,7 +68,7 @@ module Gitlab def valid_json?(metadata) Oj.load(metadata) true - rescue Oj::ParseError, EncodingError, JSON::ParserError, Encoding::UndefinedConversionError + rescue Oj::ParseError, EncodingError, JSON::ParserError, JSON::GeneratorError, Encoding::UndefinedConversionError false end |