Commit 0e15270b authored by Riyad Preukschas's avatar Riyad Preukschas

Fix crash in gitlab:check while checking hooks

parent d9ca1bce
...@@ -645,7 +645,6 @@ namespace :gitlab do ...@@ -645,7 +645,6 @@ namespace :gitlab do
hook_file = "post-receive" hook_file = "post-receive"
gitolite_hooks_path = File.join(Gitlab.config.gitolite.hooks_path, "common") gitolite_hooks_path = File.join(Gitlab.config.gitolite.hooks_path, "common")
gitolite_hook_file = File.join(gitolite_hooks_path, hook_file) gitolite_hook_file = File.join(gitolite_hooks_path, hook_file)
gitolite_hook_content = File.read(gitolite_hook_file)
gitolite_ssh_user = Gitlab.config.gitolite.ssh_user gitolite_ssh_user = Gitlab.config.gitolite.ssh_user
unless File.exists?(gitolite_hook_file) unless File.exists?(gitolite_hook_file)
...@@ -653,6 +652,7 @@ namespace :gitlab do ...@@ -653,6 +652,7 @@ namespace :gitlab do
return return
end end
gitolite_hook_content = File.read(gitolite_hook_file)
gitlab_hook_file = Rails.root.join.join("lib", "hooks", hook_file) gitlab_hook_file = Rails.root.join.join("lib", "hooks", hook_file)
gitlab_hook_content = File.read(gitlab_hook_file) gitlab_hook_content = File.read(gitlab_hook_file)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment