Merge branch 'check_hooks' of /home/git/repositories/gitlab/gitlabhq

Dmitriy Zaporozhets
2 parents 073c8a29 99916fe1
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
       hook_file = "update"
       gitlab_shell_hooks_path = Gitlab.config.gitlab_shell.hooks_path
       gitlab_shell_hook_file  = File.join(gitlab_shell_hooks_path, hook_file)
-      gitlab_shell_ssh_user = Gitlab.config.gitlab_shell.ssh_user
  
-      unless File.exists?(gitlab_shell_hook_file)
-        puts "can't check because of previous errors".magenta
-        return
+      if File.exists?(gitlab_shell_hook_file)
+        puts "yes".green
+      else
+        puts "no".red
+        puts "Could not find #{gitlab_shell_hook_file}"
+        try_fixing_it(
+          'Check the hooks_path in config/gitlab.yml',
+          'Check your gitlab-shell installation'
+        )
+        for_more_information(
+          see_installation_guide_section "GitLab Shell"
+        )
       end
-
-      puts "yes".green
     end
  
     def check_repo_base_exists
...	...	@@ -392,14 +392,20 @@ namespace :gitlab do
392	392	hook_file = "update"
393	393	gitlab_shell_hooks_path = Gitlab.config.gitlab_shell.hooks_path
394	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	408	end
401		-
402		- puts "yes".green
403	409	end
404	410
405	411	def check_repo_base_exists
...	...