Changes afte rebase

ee/lib/ee/gitlab/usage_data.rb

@@ -100,9 +100,6 @@ module EE
         end
 
         def approval_rules_counts
-          # rubocop: disable UsageData/LargeTable:
-          projects_with_service_desk = ::Project.where(service_desk_enabled: true)
-          # rubocop: enable UsageData/LargeTable:
           {
             approval_project_rules: count(ApprovalProjectRule),
             approval_project_rules_with_target_branch: count(ApprovalProjectRulesProtectedBranch, :approval_project_rule_id)
@@ -358,9 +355,10 @@ module EE
 
         # rubocop:disable CodeReuse/ActiveRecord
         def projects_jira_issuelist_active
+          # rubocop: disable UsageData/LargeTable:
           min_id = JiraTrackerData.where(issues_enabled: true).minimum(:service_id)
           max_id = JiraTrackerData.where(issues_enabled: true).maximum(:service_id)
-
+          # rubocop: enable UsageData/LargeTable:
           count(::JiraService.active.includes(:jira_tracker_data).where(jira_tracker_data: { issues_enabled: true }), start: min_id, finish: max_id)
         end
         # rubocop:enable CodeReuse/ActiveRecord

lib/gitlab/usage_data.rb

@@ -83,9 +83,11 @@ module Gitlab
             auto_devops_enabled: count(::ProjectAutoDevops.enabled),
             auto_devops_disabled: count(::ProjectAutoDevops.disabled),
             deploy_keys: count(DeployKey),
+            # rubocop: disable UsageData/LargeTable:
             deployments: deployment_count(Deployment),
             successful_deployments: deployment_count(Deployment.success),
             failed_deployments: deployment_count(Deployment.failed),
+            # rubocop: enable UsageData/LargeTable:
             environments: count(::Environment),
             clusters: count(::Clusters::Cluster),
             clusters_enabled: count(::Clusters::Cluster.enabled),
@@ -170,9 +172,11 @@ module Gitlab
       def system_usage_data_monthly
         {
           counts_monthly: {
+            # rubocop: disable UsageData/LargeTable:
             deployments: deployment_count(Deployment.where(last_28_days_time_period)),
             successful_deployments: deployment_count(Deployment.success.where(last_28_days_time_period)),
             failed_deployments: deployment_count(Deployment.failed.where(last_28_days_time_period)),
+            # rubocop: enable UsageData/LargeTable:
             personal_snippets: count(PersonalSnippet.where(last_28_days_time_period)),
             project_snippets: count(ProjectSnippet.where(last_28_days_time_period))
           }.tap do |data|
@@ -635,8 +639,9 @@ module Gitlab
 
       # rubocop: disable CodeReuse/ActiveRecord
       def service_desk_counts
+        # rubocop: disable UsageData/LargeTable:
         projects_with_service_desk = ::Project.where(service_desk_enabled: true)
-
+        # rubocop: enable UsageData/LargeTable:
         {
           service_desk_enabled_projects: count(projects_with_service_desk),
           service_desk_issues: count(