Merge branch 'patch-1' into 'master'

Fixed advice on invalid permissions on upload path When running the checks, my upload path has wrong permissions, the advice could not fix it because it does not change the permission of this directory (only sub-directories). ``` Uploads directory setup correctly? ... no Try fixing it: sudo find /home/git/gitlab/public/uploads -type d -not -path /home/git/gitlab/public/uploads -exec chmod 0700 {} \; For more information see: doc/install/installation.md in section "GitLab" Please fix the error above and rerun the checks. ``` Executing this instead fixed the error : ``` sudo chmod 700 /home/git/gitlab/public/uploads ``` See merge request !2948

Merge branch 'patch-1' into 'master'
f780bac0 · Rémy Coutable · 883e2d21 · 92df8f57 · f780bac0 · f780bac0
Commit f780bac0 authored May 19, 2016 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

CHANGELOG CHANGELOG +1 -0

check.rake lib/tasks/gitlab/check.rake +1 -1

No files found.
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -62,6 +62,7 @@ v 8.8.0 (unreleased)
  - Import pull requests from GitHub where the source or target branches were removed
  - All Grape API helpers are now instrumented
  - Improve Issue formatting for the Slack Service (Jeroen van Baarsen)
+  - Fixed advice on invalid permissions on upload path !2948 (Ludovic Perrine)

 v 8.7.6
  - Fix links on wiki pages for relative url setups. !4131 (Artem Sidorenko)

--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -303,7 +303,7 @@ namespace :gitlab do
      else
        puts "no".red
        try_fixing_it(
-          "sudo find #{upload_path} -type d -not -path #{upload_path} -exec chmod 0700 {} \\;"
+          "sudo chmod 700 #{upload_path}"
        )
        for_more_information(
          see_installation_guide_section "GitLab"