summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2017-05-18 18:23:57 +0000
committerStan Hu <stanhu@gmail.com>2017-05-18 18:23:57 +0000
commite4eec191565a053f687911d80865ad43241453f8 (patch)
tree2ebf6da30353d46076e6cd9e3af443e2f2db1d2c
parentee85508a32e277cccbc53d71d48762d6a63c37e9 (diff)
parent3396edcea054f97c41b334b2800760817a47ba0a (diff)
downloadgitlab-ce-e4eec191565a053f687911d80865ad43241453f8.tar.gz
Merge branch 'remove-services-count-from-usage-ping-data' into 'master'
Remove Services count from usage ping payload. Closes gitlab-ee#2241 See merge request !11499
-rw-r--r--lib/gitlab/usage_data.rb1
-rw-r--r--spec/lib/gitlab/usage_data_spec.rb1
2 files changed, 0 insertions, 2 deletions
diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb
index 4382cf7b12f..bcba2e3e1b6 100644
--- a/lib/gitlab/usage_data.rb
+++ b/lib/gitlab/usage_data.rb
@@ -40,7 +40,6 @@ module Gitlab
projects_prometheus_active: PrometheusService.active.count,
protected_branches: ProtectedBranch.count,
releases: Release.count,
- services: Service.where(active: true).count,
snippets: Snippet.count,
todos: Todo.count,
uploads: Upload.count,
diff --git a/spec/lib/gitlab/usage_data_spec.rb b/spec/lib/gitlab/usage_data_spec.rb
index 2c46920456b..b47e1b56fa9 100644
--- a/spec/lib/gitlab/usage_data_spec.rb
+++ b/spec/lib/gitlab/usage_data_spec.rb
@@ -50,7 +50,6 @@ describe Gitlab::UsageData do
pages_domains
protected_branches
releases
- services
snippets
todos
uploads