Commit 3487441b authored by Sean McGivern's avatar Sean McGivern

Merge branch 'tc-info-version-check' into 'master'

Be more transparent about the version check

See merge request gitlab-org/gitlab-ce!17257
parents 7a532bcf b8b913b0
......@@ -647,8 +647,11 @@
= f.label :version_check_enabled do
= f.check_box :version_check_enabled
Version check enabled
= link_to icon('question-circle'), help_page_path("user/admin_area/settings/usage_statistics", anchor: "version-check")
.help-block
Let GitLab inform you when an update is available.
Let GitLab inform you when an update is available. When
enabled, GitLab Inc. will collect info about your hostname
and version.
.form-group
.col-sm-offset-2.col-sm-10
- can_be_configured = @application_setting.usage_ping_can_be_configured?
......
---
title: Add more info about data collected when version check is enabled
merge_request: 17257
author:
type: changed
......@@ -10,8 +10,9 @@ under **Admin area > Settings > Usage statistics**.
GitLab can inform you when an update is available and the importance of it.
No information other than the GitLab version and the instance's hostname (through the HTTP referer)
are collected.
GitLab Inc. collects version statistics, but no information other than
the GitLab version and the instance's hostname (through the HTTP
referer) is collected.
In the **Overview** tab you can see if your GitLab version is up to date. There
are three cases: 1) you are up to date (green), 2) there is an update available
......
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