root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Add user_preferences_usage to usage ping

This commit is contained in:
Victor Zagorodny 2019-02-06 19:56:16 +02:00
parent 885e2a9c93
commit 60bd0a24f5
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/gitlab/usage_data.rb
View File

@ -90,7 +90,10 @@ module Gitlab
todos: count(Todo), todos: count(Todo),
uploads: count(Upload), uploads: count(Upload),
web_hooks: count(WebHook) web_hooks: count(WebHook)
}.merge(services_usage).merge(approximate_counts) }
.merge(services_usage)
.merge(approximate_counts)
.merge(user_preferences: user_preferences_usage)
} }
end end
# rubocop: enable CodeReuse/ActiveRecord # rubocop: enable CodeReuse/ActiveRecord
@ -159,6 +162,10 @@ module Gitlab
} }
end end
def user_preferences_usage
{} # augmented in EE
end
def count(relation, fallback: -1) def count(relation, fallback: -1)
relation.count relation.count
rescue ActiveRecord::StatementInvalid rescue ActiveRecord::StatementInvalid

1
spec/lib/gitlab/usage_data_spec.rb
View File

@ -124,6 +124,7 @@ describe Gitlab::UsageData do
todos todos
uploads uploads
web_hooks web_hooks
user_preferences
)) ))
end end