Upgrades OJ to 3.13.16

EE: true

Gemfile

@@ -537,7 +537,7 @@ gem 'valid_email', '~> 0.1'
 # JSON
 gem 'json', '~> 2.5.1'
 gem 'json_schemer', '~> 0.2.18'
-gem 'oj', '~> 3.10.6'
+gem 'oj', '~> 3.13.16'
 gem 'multi_json', '~> 1.14.1'
 gem 'yajl-ruby', '~> 1.4.1', require: 'yajl'
 

Gemfile.lock

@@ -861,7 +861,7 @@ GEM
       plist (~> 3.1)
       train-core
       wmi-lite (~> 1.0)
-    oj (3.10.6)
+    oj (3.13.16)
     omniauth (1.9.1)
       hashie (>= 3.4.6)
       rack (>= 1.6.2, < 3)
@@ -1633,7 +1633,7 @@ DEPENDENCIES
   oauth2 (~> 2.0)
   octokit (~> 4.15)
   ohai (~> 16.10)
-  oj (~> 3.10.6)
+  oj (~> 3.13.16)
   omniauth (~> 1.8)
   omniauth-alicloud (~> 1.0.1)
   omniauth-atlassian-oauth2 (~> 0.2.0)

ee/spec/services/ide/schemas_config_service_spec.rb

@@ -104,7 +104,7 @@
         it 'returns schema successfully' do
           expect(Gitlab::HTTP).to receive(:get).with("https://someurl.com")
           expect(subject[:status]).to eq(:error)
-          expect(subject[:message]).to include('unexpected character () at line 1, column 1')
+          expect(subject[:message]).to include('unexpected character (after ) at line 1, column 1')
         end
       end
 

ee/spec/tasks/gitlab/spdx_rake_spec.rb

@@ -30,7 +30,7 @@
       end
 
       it 'raises parsing failure' do
-        expect { subject }.to output(/Import of SPDX catalogue failed: unexpected colon \(\)/).to_stdout
+        expect { subject }.to output(/Import of SPDX catalogue failed: unexpected colon \(after \)/).to_stdout
       end
     end
 

lib/gitlab/background_migration/fix_vulnerability_occurrences_with_hashes_as_raw_metadata.rb

@@ -68,7 +68,7 @@ def mark_job_as_succeeded(*arguments)
       def valid_json?(metadata)
         Oj.load(metadata)
         true
-      rescue Oj::ParseError, Encoding::UndefinedConversionError
+      rescue Oj::ParseError, EncodingError, Json::ParseError, Encoding::UndefinedConversionError
         false
       end
 

lib/gitlab/json.rb

@@ -95,7 +95,7 @@ def adapter_load(string, *args, **opts)
         opts = standardize_opts(opts)
 
         Oj.load(string, opts)
-      rescue Oj::ParseError, Encoding::UndefinedConversionError => ex
+      rescue Oj::ParseError, EncodingError, JSON::ParseError, Encoding::UndefinedConversionError => ex
         raise parser_error, ex
       end