Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42

3 files changed, 6 insertions, 1 deletions

diff --git a/lib/gitlab/ci/reports/security/report.rb b/lib/gitlab/ci/reports/security/report.rb
index 8c528056d0c..70f2919d38d 100644
--- a/lib/gitlab/ci/reports/security/report.rb
+++ b/lib/gitlab/ci/reports/security/report.rb
@@ -9,6 +9,7 @@ module Gitlab
           attr_accessor :scan, :scanned_resources, :errors, :analyzer, :version, :schema_validation_status, :warnings
 
           delegate :project_id, to: :pipeline
+          delegate :project, to: :pipeline
 
           def initialize(type, pipeline, created_at)
             @type = type
@@ -38,6 +39,10 @@ module Gitlab
             errors.present?
           end
 
+          def warnings?
+            warnings.present?
+          end
+
           def add_scanner(scanner)
             scanners[scanner.key] ||= scanner
           end
diff --git a/lib/gitlab/ci/reports/security/scanner.rb b/lib/gitlab/ci/reports/security/scanner.rb
index c1de03cea44..1ac66a0c671 100644
--- a/lib/gitlab/ci/reports/security/scanner.rb
+++ b/lib/gitlab/ci/reports/security/scanner.rb
@@ -12,6 +12,7 @@ module Gitlab
             "gemnasium-maven" => 3,
             "gemnasium-python" => 3,
             "bandit" => 1,
+            "spotbugs" => 1,
             "semgrep" =>  2
           }.freeze
 
diff --git a/lib/gitlab/ci/reports/test_suite.rb b/lib/gitlab/ci/reports/test_suite.rb
index 00920dfbd54..d0388c65f58 100644
--- a/lib/gitlab/ci/reports/test_suite.rb
+++ b/lib/gitlab/ci/reports/test_suite.rb
@@ -12,7 +12,6 @@ module Gitlab
         def initialize(name = nil)
           @name = name
           @test_cases = {}
-          @all_test_cases = []
           @total_time = 0.0
         end