Commit 3db47d12f2687f674064567cb6c48c7df1c03288
Exists in
master
and in
4 other branches
Merge branch 'check_hooks' of /home/git/repositories/gitlab/gitlabhq
Showing
1 changed file
with
12 additions
and
6 deletions
Show diff stats
lib/tasks/gitlab/check.rake
| @@ -392,14 +392,20 @@ namespace :gitlab do | @@ -392,14 +392,20 @@ namespace :gitlab do | ||
| 392 | hook_file = "update" | 392 | hook_file = "update" |
| 393 | gitlab_shell_hooks_path = Gitlab.config.gitlab_shell.hooks_path | 393 | gitlab_shell_hooks_path = Gitlab.config.gitlab_shell.hooks_path |
| 394 | gitlab_shell_hook_file = File.join(gitlab_shell_hooks_path, hook_file) | 394 | gitlab_shell_hook_file = File.join(gitlab_shell_hooks_path, hook_file) |
| 395 | - gitlab_shell_ssh_user = Gitlab.config.gitlab_shell.ssh_user | ||
| 396 | 395 | ||
| 397 | - unless File.exists?(gitlab_shell_hook_file) | ||
| 398 | - puts "can't check because of previous errors".magenta | ||
| 399 | - return | 396 | + if File.exists?(gitlab_shell_hook_file) |
| 397 | + puts "yes".green | ||
| 398 | + else | ||
| 399 | + puts "no".red | ||
| 400 | + puts "Could not find #{gitlab_shell_hook_file}" | ||
| 401 | + try_fixing_it( | ||
| 402 | + 'Check the hooks_path in config/gitlab.yml', | ||
| 403 | + 'Check your gitlab-shell installation' | ||
| 404 | + ) | ||
| 405 | + for_more_information( | ||
| 406 | + see_installation_guide_section "GitLab Shell" | ||
| 407 | + ) | ||
| 400 | end | 408 | end |
| 401 | - | ||
| 402 | - puts "yes".green | ||
| 403 | end | 409 | end |
| 404 | 410 | ||
| 405 | def check_repo_base_exists | 411 | def check_repo_base_exists |