From b8b913b0fc0790ab4c5824f6e717a24c4d1d28d8 Mon Sep 17 00:00:00 2001 From: Toon Claes Date: Wed, 21 Feb 2018 11:30:10 +0100 Subject: Add more info about data collected when version check is enabled --- app/views/admin/application_settings/_form.html.haml | 5 ++++- changelogs/unreleased/tc-info-version-check.yml | 5 +++++ doc/user/admin_area/settings/usage_statistics.md | 5 +++-- 3 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 changelogs/unreleased/tc-info-version-check.yml diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index 60f12030f98..938185b6eba 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -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? diff --git a/changelogs/unreleased/tc-info-version-check.yml b/changelogs/unreleased/tc-info-version-check.yml new file mode 100644 index 00000000000..9f20d03b864 --- /dev/null +++ b/changelogs/unreleased/tc-info-version-check.yml @@ -0,0 +1,5 @@ +--- +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 d874688cc29..81b135a5b37 100644 --- a/doc/user/admin_area/settings/usage_statistics.md +++ b/doc/user/admin_area/settings/usage_statistics.md @@ -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 -- cgit v1.2.1