kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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

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

See merge request gitlab-org/gitlab-ce!17269
This commit is contained in:
Sean McGivern 2018-02-22 16:08:33 +00:00
commit 2d00498247
3 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/views/admin/application_settings/_form.html.haml
View file

@ -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?

5
changelogs/unreleased/tc-info-version-check.yml
View file

@ -1,5 +0,0 @@
---
title: Add more info about data collected when version check is enabled
merge_request: 17257
author:
type: changed

5
doc/user/admin_area/settings/usage_statistics.md
View file

@ -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