Commit 2d004982 authored by Sean McGivern's avatar Sean McGivern

Merge branch 'revert-3487441b' into 'master'

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

See merge request gitlab-org/gitlab-ce!17269
parents b5306075 6dcadfc9
...@@ -647,11 +647,8 @@ ...@@ -647,11 +647,8 @@
= f.label :version_check_enabled do = f.label :version_check_enabled do
= f.check_box :version_check_enabled = f.check_box :version_check_enabled
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 .help-block
Let GitLab inform you when an update is available. When Let GitLab inform you when an update is available.
enabled, GitLab Inc. will collect info about your hostname
and version.
.form-group .form-group
.col-sm-offset-2.col-sm-10 .col-sm-offset-2.col-sm-10
- can_be_configured = @application_setting.usage_ping_can_be_configured? - 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,9 +10,8 @@ under **Admin area > Settings > Usage statistics**. ...@@ -10,9 +10,8 @@ under **Admin area > Settings > Usage statistics**.
GitLab can inform you when an update is available and the importance of it. GitLab can inform you when an update is available and the importance of it.
GitLab Inc. collects version statistics, but no information other than No information other than the GitLab version and the instance's hostname (through the HTTP referer)
the GitLab version and the instance's hostname (through the HTTP are collected.
referer) is collected.
In the **Overview** tab you can see if your GitLab version is up to date. There 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 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