Merge branch 'ce-to-ee-2018-02-22' into 'master'

CE upstream - 2018-02-22 18:24 UTC

Closes #4998

See merge request gitlab-org/gitlab-ee!4683

app/views/admin/application_settings/_form.html.haml

@@ -687,11 +687,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?

changelogs/unreleased/tc-info-version-check.yml

----
-title: Add more info about data collected when version check is enabled
-merge_request: 17257
-author:
-type: changed

doc/administration/logs.md

@@ -32,6 +32,8 @@ In this example, you can see this was a GET request for a specific issue. Notice
 2. `view`: total time taken inside the Rails views
 3. `db`: total time to retrieve data from the database
 
+User clone/fetch activity using http transport appears in this log as `action: git_upload_pack`.
+
 In addition, the log contains the IP address from which the request originated
 (`remote_ip`) as well as the user's ID (`user_id`), and username (`username`).
 
@@ -157,6 +159,8 @@ I, [2015-02-13T06:17:00.671315 #9291]  INFO -- : Adding project root/example.git
 I, [2015-02-13T06:17:00.679433 #9291]  INFO -- : Moving existing hooks directory and symlinking global hooks directory for /var/opt/gitlab/git-data/repositories/root/example.git.
 ```
 
+User clone/fetch activity using ssh transport appears in this log as `executing git command <gitaly-upload-pack...`.
+
 ## `unicorn\_stderr.log`
 
 This file lives in `/var/log/gitlab/unicorn/unicorn_stderr.log` for

doc/gitlab-basics/create-project.md

@@ -41,7 +41,7 @@ When you create a new repo locally, instead of going to GitLab to manually
 create a new project and then push the repo, you can directly push it to
 GitLab to create the new project, all without leaving your terminal. If you have access to that
 namespace, we will automatically create a new project under that GitLab namespace with its 
-visibility set to private by default (you can later change it in the UI).
+visibility set to Private by default (you can later change it in the [project's settings](../public_access/public_access.md#how-to-change-project-visibility)).
 
 This can be done by using either SSH or HTTP:
 

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

doc/user/project/milestones/index.md

@@ -123,4 +123,4 @@ The milestone sidebar on the milestone view shows the following:
 
 For project milestones only, the milestone sidebar shows the total issue weight of all issues that have the milestone assigned.
 
-![Project milestone page](img/milestones_project_milestone_page.png)
+![Project milestone page](img/milestones_project_milestone_page.png)
\ No newline at end of file