Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2022-06-20 14:10:13 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2022-06-20 14:10:13 +0300
commit0ea3fcec397b69815975647f5e2aa5fe944a8486 (patch)
tree7979381b89d26011bcf9bdc989a40fcc2f1ed4ff /lib/service_ping
parent72123183a20411a36d607d70b12d57c484394c8e (diff)
Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42
Diffstat (limited to 'lib/service_ping')
-rw-r--r--lib/service_ping/build_payload.rb2
-rw-r--r--lib/service_ping/permit_data_categories.rb2
2 files changed, 0 insertions, 4 deletions
diff --git a/lib/service_ping/build_payload.rb b/lib/service_ping/build_payload.rb
index 4d3b32a1fc0..3553b624ae0 100644
--- a/lib/service_ping/build_payload.rb
+++ b/lib/service_ping/build_payload.rb
@@ -3,8 +3,6 @@
module ServicePing
class BuildPayload
def execute
- return {} unless ServicePingSettings.product_intelligence_enabled?
-
filtered_usage_data
end
diff --git a/lib/service_ping/permit_data_categories.rb b/lib/service_ping/permit_data_categories.rb
index 51eec0808cb..cf69f7503b7 100644
--- a/lib/service_ping/permit_data_categories.rb
+++ b/lib/service_ping/permit_data_categories.rb
@@ -14,8 +14,6 @@ module ServicePing
].to_set.freeze
def execute
- return [] unless ServicePingSettings.product_intelligence_enabled?
-
CATEGORIES
end
end