diff options
| author | Rubén Dávila <rdavila84@gmail.com> | 2016-01-14 17:28:44 -0500 |
|---|---|---|
| committer | Rubén Dávila <rdavila84@gmail.com> | 2016-01-14 17:28:44 -0500 |
| commit | c8db25c37c0d78457d06117497ccde7ad80e2321 (patch) | |
| tree | dc2db4637c33c53b032a22f8e78975838396ed13 /lib/tasks | |
| parent | 6b9c730e91962a6d6343bcb7fc4dc75c99b41bde (diff) | |
| parent | 948bb655f3cba9909b7396c3062da7b22f4409b3 (diff) | |
| download | gitlab-ce-c8db25c37c0d78457d06117497ccde7ad80e2321.tar.gz | |
Merge branch 'master' into issue_3945
Diffstat (limited to 'lib/tasks')
| -rw-r--r-- | lib/tasks/gitlab/check.rake | 2 | ||||
| -rw-r--r-- | lib/tasks/gitlab/task_helpers.rake | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake index 0469c5a61c3..2dc2953e328 100644 --- a/lib/tasks/gitlab/check.rake +++ b/lib/tasks/gitlab/check.rake @@ -431,7 +431,7 @@ namespace :gitlab do try_fixing_it( "sudo chmod -R ug+rwX,o-rwx #{repo_base_path}", "sudo chmod -R ug-s #{repo_base_path}", - "find #{repo_base_path} -type d -print0 | sudo xargs -0 chmod g+s" + "sudo find #{repo_base_path} -type d -print0 | sudo xargs -0 chmod g+s" ) for_more_information( see_installation_guide_section "GitLab Shell" diff --git a/lib/tasks/gitlab/task_helpers.rake b/lib/tasks/gitlab/task_helpers.rake index ebe516ec879..8c63877e51c 100644 --- a/lib/tasks/gitlab/task_helpers.rake +++ b/lib/tasks/gitlab/task_helpers.rake @@ -2,6 +2,8 @@ module Gitlab class TaskAbortedByUserError < StandardError; end end +String.disable_colorization = true unless STDOUT.isatty + namespace :gitlab do # Ask if the user wants to continue |