diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-04-05 13:49:22 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-04-14 15:20:55 +0200 |
| commit | c53afeda0c2ee0cda89c235c9e8799baa1cfdc1a (patch) | |
| tree | 7efaef06c5ec20fc87fe6dadf1a794c8ef00f187 /lib | |
| parent | f5b42881c88678cd85ea7743fdffa400105b4b8d (diff) | |
| download | gitlab-ce-c53afeda0c2ee0cda89c235c9e8799baa1cfdc1a.tar.gz | |
Port 'Add uuid to usage ping' to CE
CE port of https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1521
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/usage_data.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb index ae1ae82ab4c..46875908fa3 100644 --- a/lib/gitlab/usage_data.rb +++ b/lib/gitlab/usage_data.rb @@ -1,5 +1,7 @@ module Gitlab class UsageData + include Gitlab::CurrentSettings + class << self def data Rails.cache.fetch('usage_data', expires_in: 1.hour) { uncached_data } @@ -45,7 +47,8 @@ module Gitlab end def license_usage_data - usage_data = { version: Gitlab::VERSION, + usage_data = { uuid: current_application_settings.uuid, + version: Gitlab::VERSION, active_user_count: User.active.count, recorded_at: Time.now, mattermost_enabled: Gitlab.config.mattermost.enabled } |