summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-12-24 16:41:46 +0100
committerRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-12-24 16:45:08 +0100
commit0e15270b75df9e882bc41e22a6a120092a629a02 (patch)
treed5340770d39e3b61c961761919bea07d19096158 /lib
parentd9ca1bce7a52709aa9d1aa60940cab69861e09c0 (diff)
downloadgitlab-ce-0e15270b75df9e882bc41e22a6a120092a629a02.tar.gz
Fix crash in gitlab:check while checking hooks
Diffstat (limited to 'lib')
-rw-r--r--lib/tasks/gitlab/check.rake2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
index f8448d19666..f052de77184 100644
--- a/lib/tasks/gitlab/check.rake
+++ b/lib/tasks/gitlab/check.rake
@@ -645,7 +645,6 @@ namespace :gitlab do
hook_file = "post-receive"
gitolite_hooks_path = File.join(Gitlab.config.gitolite.hooks_path, "common")
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
unless File.exists?(gitolite_hook_file)
@@ -653,6 +652,7 @@ namespace :gitlab do
return
end
+ gitolite_hook_content = File.read(gitolite_hook_file)
gitlab_hook_file = Rails.root.join.join("lib", "hooks", hook_file)
gitlab_hook_content = File.read(gitlab_hook_file)