Commit 2a634dc0 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'zj-usage-ping-mattermost' into 'master'

Track Mattermost usage

See merge request !1071
parents dda3aa8c af8db537
---
title: Track Mattermost usage in usage ping
merge_request: 1071
author:
...@@ -75,6 +75,9 @@ The total number of the following is sent back to GitLab Inc.: ...@@ -75,6 +75,9 @@ The total number of the following is sent back to GitLab Inc.:
- Remote mirrors - Remote mirrors
- Web hooks - Web hooks
Also, we track if you've installed Mattermost with GitLab.
For example: `"mattermost_enabled":true"`.
## Privacy policy ## Privacy policy
GitLab Inc. does **not** collect any sensitive information, like project names GitLab Inc. does **not** collect any sensitive information, like project names
......
...@@ -53,7 +53,9 @@ module Gitlab ...@@ -53,7 +53,9 @@ module Gitlab
def license_usage_data def license_usage_data
usage_data = { version: Gitlab::VERSION, usage_data = { version: Gitlab::VERSION,
active_user_count: User.active.count } active_user_count: User.active.count,
mattermost_enabled: Gitlab.config.mattermost.enabled }
license = ::License.current license = ::License.current
if license if license
......
...@@ -21,6 +21,7 @@ describe Gitlab::UsageData do ...@@ -21,6 +21,7 @@ describe Gitlab::UsageData do
license_md5 license_md5
recorded_at recorded_at
version version
mattermost_enabled
)) ))
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment