Merge branch 'rails5-fix-vulnerabilities-controller-spec' into 'master'

Rails5: fix VulnerabilitySummaryEntity

See merge request gitlab-org/gitlab-ee!7893

ee/app/serializers/vulnerability_summary_entity.rb

@@ -2,10 +2,11 @@
 
 class VulnerabilitySummaryEntity < Grape::Entity
   Vulnerabilities::Occurrence::REPORT_TYPES.each do |report_type_name, report_type|
+    report_key = Gitlab.rails5? ? report_type_name : report_type
     expose report_type_name do
       Vulnerabilities::Occurrence::LEVELS.each do |severity_name, severity|
         expose severity_name do |group|
-          grouped_vulnerabilities[[report_type, severity]] || 0
+          grouped_vulnerabilities[[report_key, severity]] || 0
         end
       end
     end

ee/changelogs/unreleased/rails5-fix-vulnerabilities-controller-spec.yml

+---
+title: 'Rails5: fix VulnerabilitySummaryEntity'
+merge_request: 7893
+author: Jasper Maes
+type: other