Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-08-01

# Conflicts:
#	doc/raketasks/cleanup.md

[ci skip]

doc/raketasks/cleanup.md

@@ -23,6 +23,7 @@ sudo gitlab-rake gitlab:cleanup:repos
 bundle exec rake gitlab:cleanup:repos RAILS_ENV=production
 ```
 
+<<<<<<< HEAD
 Remove old repository copies from repositories moved to another storage.
 
 ```
@@ -33,6 +34,8 @@ sudo gitlab-rake gitlab:cleanup:moved
 bundle exec rake gitlab:cleanup:moved RAILS_ENV=production
 
 ```
+=======
+>>>>>>> upstream/master
 Clean up local project upload files if they don't exist in GitLab database. The
 task attempts to fix the file if it can find its project, otherwise it moves the
 file to a lost and found directory.
@@ -62,4 +65,8 @@ D, [2018-07-27T12:08:33.293568 #89817] DEBUG -- : Processing batch of 500 projec
 I, [2018-07-27T12:08:33.689869 #89817]  INFO -- : Did move to lost and found /opt/gitlab/embedded/service/gitlab-rails/public/uploads/test.out -> /opt/gitlab/embedded/service/gitlab-rails/public/uploads/-/project-lost-found/test.out
 I, [2018-07-27T12:08:33.755624 #89817]  INFO -- : Did fix /opt/gitlab/embedded/service/gitlab-rails/public/uploads/foo/bar/89a0f7b0b97008a4a18cedccfdcd93fb/foo.txt -> /opt/gitlab/embedded/service/gitlab-rails/public/uploads/qux/foo/bar/89a0f7b0b97008a4a18cedccfdcd93fb/foo.txt
 I, [2018-07-27T12:08:33.760257 #89817]  INFO -- : Did move to lost and found /opt/gitlab/embedded/service/gitlab-rails/public/uploads/foo/bar/1dd6f0f7eefd2acc4c2233f89a0f7b0b/image.png -> /opt/gitlab/embedded/service/gitlab-rails/public/uploads/-/project-lost-found/foo/bar/1dd6f0f7eefd2acc4c2233f89a0f7b0b/image.png
+<<<<<<< HEAD
 ```
+=======
+```
+>>>>>>> upstream/master