Add latest changes from gitlab-org/gitlab@master

doc/user/application_security/security_dashboard/index.md

@@ -249,7 +249,7 @@ to configure daily security scans.
 Each vulnerability report contains vulnerabilities from the latest scans that were merged
 into the default branch.
 
-![Vulnerability Report](img/group_vulnerability_report_v13_4.png)
+![Vulnerability Report](img/group_vulnerability_report_v13_7.png)
 
 You can filter which vulnerabilities the vulnerability report displays by:
 

lib/gitlab/gpg.rb

@@ -142,13 +142,11 @@ module Gitlab
     end
 
     def tmp_keychains_created
-      @tmp_keychains_created ||= Gitlab::Metrics.counter(:gpg_tmp_keychains_created_total,
-                                                         'The number of temporary GPG keychains created')
+      Gitlab::Metrics.counter(:gpg_tmp_keychains_created_total, 'The number of temporary GPG keychains created')
     end
 
     def tmp_keychains_removed
-      @tmp_keychains_removed ||= Gitlab::Metrics.counter(:gpg_tmp_keychains_removed_total,
-                                                         'The number of temporary GPG keychains removed')
+      Gitlab::Metrics.counter(:gpg_tmp_keychains_removed_total, 'The number of temporary GPG keychains removed')
     end
   end
 end

spec/lib/gitlab/gpg_spec.rb

@@ -143,11 +143,6 @@ RSpec.describe Gitlab::Gpg do
     end
 
     it 'keeps track of created and removed keychains in counters' do
-      # Gitlab::Gpg may be memoizing stale counters if a preceding spec resets the Prometheus registry
-      # https://gitlab.com/gitlab-org/gitlab/-/issues/286874
-      described_class.remove_instance_variable(:@tmp_keychains_created)
-      described_class.remove_instance_variable(:@tmp_keychains_removed)
-
       created = Gitlab::Metrics.counter(:gpg_tmp_keychains_created_total, 'The number of temporary GPG keychains')
       removed = Gitlab::Metrics.counter(:gpg_tmp_keychains_removed_total, 'The number of temporary GPG keychains')