Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-10-14

# Conflicts:
#	doc/administration/job_artifacts.md

[ci skip]

doc/administration/job_artifacts.md

@@ -315,6 +315,9 @@ memory and disk I/O.
 [reconfigure gitlab]: restart_gitlab.md#omnibus-gitlab-reconfigure "How to reconfigure Omnibus GitLab"
 [restart gitlab]: restart_gitlab.md#installations-from-source "How to restart GitLab"
 [gitlab workhorse]: https://gitlab.com/gitlab-org/gitlab-workhorse "GitLab Workhorse repository"
+<<<<<<< HEAD
 [eep]: https://about.gitlab.com/products/ "GitLab Premium"
 [ee-1762]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/1762
 [browsable]: ../user/project/pipelines/job_artifacts.md#browsing-job-artifacts
+=======
+>>>>>>> upstream/master