diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-23 21:06:14 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-09-23 21:06:14 +0300 |
| commit | c792263edfaf826c58f4aa41d26904464a17a3e7 (patch) | |
| tree | b57ae96c9eeaf0a1432a29f7f50f2fce9529818d /lib/gitlab/usage_data.rb | |
| parent | 6f9edd1a4c4942d3d13ec54793cfae56164b1a0a (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/usage_data.rb')
| -rw-r--r-- | lib/gitlab/usage_data.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb index ed2693aaedf..c5303dad558 100644 --- a/lib/gitlab/usage_data.rb +++ b/lib/gitlab/usage_data.rb @@ -17,7 +17,6 @@ module Gitlab .merge(features_usage_data) .merge(components_usage_data) .merge(cycle_analytics_usage_data) - .merge(usage_counters) end def to_json(force_refresh: false) @@ -99,6 +98,7 @@ module Gitlab web_hooks: count(WebHook) }.merge(services_usage) .merge(approximate_counts) + .merge(usage_counters) }.tap do |data| data[:counts][:user_preferences] = user_preferences_usage end |