summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Wu <victor@gitlab.com>2018-02-21 16:54:56 +0000
committerVictor Wu <victor@gitlab.com>2018-02-21 16:54:56 +0000
commit6dcadfc900ad309546b89c9c958b7a5c78931595 (patch)
treed0ee5d12499aac76df61cad2bc08f65bcf43b607
parent94ac29f66d78e949b50e353c8ba4827bd33084ce (diff)
downloadgitlab-ce-6dcadfc900ad309546b89c9c958b7a5c78931595.tar.gz
Revert "Merge branch 'tc-info-version-check' into 'master'"revert-3487441b
This reverts merge request !17257
-rw-r--r--app/views/admin/application_settings/_form.html.haml5
-rw-r--r--changelogs/unreleased/tc-info-version-check.yml5
-rw-r--r--doc/user/admin_area/settings/usage_statistics.md5
3 files changed, 3 insertions, 12 deletions
diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml
index 938185b6eba..60f12030f98 100644
--- a/app/views/admin/application_settings/_form.html.haml
+++ b/app/views/admin/application_settings/_form.html.haml
@@ -647,11 +647,8 @@
= 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. When
- enabled, GitLab Inc. will collect info about your hostname
- and version.
+ Let GitLab inform you when an update is available.
.form-group
.col-sm-offset-2.col-sm-10
- can_be_configured = @application_setting.usage_ping_can_be_configured?
diff --git a/changelogs/unreleased/tc-info-version-check.yml b/changelogs/unreleased/tc-info-version-check.yml
deleted file mode 100644
index 9f20d03b864..00000000000
--- a/changelogs/unreleased/tc-info-version-check.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Add more info about data collected when version check is enabled
-merge_request: 17257
-author:
-type: changed
diff --git a/doc/user/admin_area/settings/usage_statistics.md b/doc/user/admin_area/settings/usage_statistics.md
index 81b135a5b37..d874688cc29 100644
--- a/doc/user/admin_area/settings/usage_statistics.md
+++ b/doc/user/admin_area/settings/usage_statistics.md
@@ -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 Inc. collects version statistics, but no information other than
-the GitLab version and the instance's hostname (through the HTTP
-referer) is collected.
+No information other than the GitLab version and the instance's hostname (through the HTTP referer)
+are 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