Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
2a634dc0
Commit
2a634dc0
authored
Jan 23, 2017
by
Robert Speicher
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'zj-usage-ping-mattermost' into 'master'
Track Mattermost usage See merge request !1071
parents
dda3aa8c
af8db537
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
1 deletion
+11
-1
changelogs/unreleased-ee/zj-usage-ping-mattermost.yml
changelogs/unreleased-ee/zj-usage-ping-mattermost.yml
+4
-0
doc/user/admin_area/settings/usage_statistics.md
doc/user/admin_area/settings/usage_statistics.md
+3
-0
lib/gitlab/usage_data.rb
lib/gitlab/usage_data.rb
+3
-1
spec/lib/gitlab/usage_data_spec.rb
spec/lib/gitlab/usage_data_spec.rb
+1
-0
No files found.
changelogs/unreleased-ee/zj-usage-ping-mattermost.yml
0 → 100644
View file @
2a634dc0
---
title
:
Track Mattermost usage in usage ping
merge_request
:
1071
author
:
doc/user/admin_area/settings/usage_statistics.md
View file @
2a634dc0
...
...
@@ -75,6 +75,9 @@ The total number of the following is sent back to GitLab Inc.:
-
Remote mirrors
-
Web hooks
Also, we track if you've installed Mattermost with GitLab.
For example:
`"mattermost_enabled":true"`
.
## Privacy policy
GitLab Inc. does
**not**
collect any sensitive information, like project names
...
...
lib/gitlab/usage_data.rb
View file @
2a634dc0
...
...
@@ -53,7 +53,9 @@ module Gitlab
def
license_usage_data
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
if
license
...
...
spec/lib/gitlab/usage_data_spec.rb
View file @
2a634dc0
...
...
@@ -21,6 +21,7 @@ describe Gitlab::UsageData do
license_md5
recorded_at
version
mattermost_enabled
)
)
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment