Merge branch 'ignore_scanned_resources_count_229773' into 'master'

Ignore scanned_resources_count on Security::Scan

See merge request gitlab-org/gitlab!44695

ee/app/models/security/scan.rb

@@ -2,8 +2,12 @@
 
 module Security
   class Scan < ApplicationRecord
+    include IgnorableColumns
+
     self.table_name = 'security_scans'
 
+    ignore_column :scanned_resources_count, remove_with: '13.7', remove_after: '2020-12-22'
+
     validates :build_id, presence: true
     validates :scan_type, presence: true
 

ee/spec/requests/api/graphql/project/pipeline/security_report_summary_spec.rb

@@ -10,7 +10,6 @@ RSpec.describe 'Query.project(fullPath).pipeline(iid).securityReportSummary' do
   before_all do
     create(:ci_build, :success, name: 'dast_job', pipeline: pipeline, project: project) do |job|
       create(:ee_ci_job_artifact, :dast_large_scanned_resources_field, job: job, project: project)
-      create(:security_scan, scan_type: 'dast', scanned_resources_count: 26, build: job)
     end
     create(:ci_build, :success, name: 'sast_job', pipeline: pipeline, project: project) do |job|
       create(:ee_ci_job_artifact, :sast, job: job, project: project)