Add latest changes from gitlab-org/gitlab@14-2-stable-eev14.2.0-rc42

3 files changed, 23 insertions, 16 deletions

diff --git a/app/services/service_ping/permit_data_categories_service.rb b/app/services/service_ping/permit_data_categories_service.rb
index ff48c022b56..d8fa255a485 100644
--- a/app/services/service_ping/permit_data_categories_service.rb
+++ b/app/services/service_ping/permit_data_categories_service.rb
@@ -2,10 +2,10 @@
 
 module ServicePing
   class PermitDataCategoriesService
-    STANDARD_CATEGORY = 'Standard'
-    SUBSCRIPTION_CATEGORY = 'Subscription'
-    OPERATIONAL_CATEGORY = 'Operational'
-    OPTIONAL_CATEGORY = 'Optional'
+    STANDARD_CATEGORY = 'standard'
+    SUBSCRIPTION_CATEGORY = 'subscription'
+    OPERATIONAL_CATEGORY = 'operational'
+    OPTIONAL_CATEGORY = 'optional'
     CATEGORIES = [
       STANDARD_CATEGORY,
       SUBSCRIPTION_CATEGORY,
@@ -14,20 +14,10 @@ module ServicePing
     ].to_set.freeze
 
     def execute
-      return [] unless product_intelligence_enabled?
+      return [] unless ServicePingSettings.product_intelligence_enabled?
 
       CATEGORIES
     end
-
-    def product_intelligence_enabled?
-      pings_enabled? && !User.single_user&.requires_usage_stats_consent?
-    end
-
-    private
-
-    def pings_enabled?
-      ::Gitlab::CurrentSettings.usage_ping_enabled?
-    end
   end
 end
 
diff --git a/app/services/service_ping/service_ping_settings.rb b/app/services/service_ping/service_ping_settings.rb
new file mode 100644
index 00000000000..6964210b1db
--- /dev/null
+++ b/app/services/service_ping/service_ping_settings.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module ServicePing
+  module ServicePingSettings
+    extend self
+
+    def product_intelligence_enabled?
+      enabled? && !User.single_user&.requires_usage_stats_consent?
+    end
+
+    def enabled?
+      ::Gitlab::CurrentSettings.usage_ping_enabled?
+    end
+  end
+end
+
+ServicePing::ServicePingSettings.extend_mod_with('ServicePing::ServicePingSettings')
diff --git a/app/services/service_ping/submit_service.rb b/app/services/service_ping/submit_service.rb
index 5c03aa46e18..09d1670fd1f 100644
--- a/app/services/service_ping/submit_service.rb
+++ b/app/services/service_ping/submit_service.rb
@@ -18,7 +18,7 @@ module ServicePing
     SubmissionError = Class.new(StandardError)
 
     def execute
-      return unless ServicePing::PermitDataCategoriesService.new.product_intelligence_enabled?
+      return unless ServicePing::ServicePingSettings.product_intelligence_enabled?
 
       begin
         usage_data = BuildPayloadService.new.execute