Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
6dcadfc9
Commit
6dcadfc9
authored
Feb 21, 2018
by
Victor Wu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Merge branch 'tc-info-version-check' into 'master'"
This reverts merge request !17257
parent
94ac29f6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
12 deletions
+3
-12
app/views/admin/application_settings/_form.html.haml
app/views/admin/application_settings/_form.html.haml
+1
-4
changelogs/unreleased/tc-info-version-check.yml
changelogs/unreleased/tc-info-version-check.yml
+0
-5
doc/user/admin_area/settings/usage_statistics.md
doc/user/admin_area/settings/usage_statistics.md
+2
-3
No files found.
app/views/admin/application_settings/_form.html.haml
View file @
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?
...
...
changelogs/unreleased/tc-info-version-check.yml
deleted
100644 → 0
View file @
94ac29f6
---
title
:
Add more info about data collected when version check is enabled
merge_request
:
17257
author
:
type
:
changed
doc/user/admin_area/settings/usage_statistics.md
View file @
6dcadfc9
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment