diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-26 20:54:23 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-02-26 20:54:23 +0000 |
| commit | b155a44ef4c1da6faaa2a8aaadd9dfad879889e0 (patch) | |
| tree | bd5651b96cbee180c35aad5892fc557e70f566ba | |
| parent | fd3ab6955f85142c6694ddea7aeb8335a2f08275 (diff) | |
| parent | 91c70c5b1c60160253520a5ac6ac3eec46faf416 (diff) | |
| download | gitlab-ce-b155a44ef4c1da6faaa2a8aaadd9dfad879889e0.tar.gz | |
Merge branch 'backup_restore_hooks_bug' into 'master'
Fix backup/restore git hooks bug
| -rw-r--r-- | lib/backup/repository.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/backup/repository.rb b/lib/backup/repository.rb index 20fd5ba92a1..552f7eaa5ce 100644 --- a/lib/backup/repository.rb +++ b/lib/backup/repository.rb @@ -72,8 +72,7 @@ module Backup end print 'Put GitLab hooks in repositories dirs'.yellow - gitlab_shell_user_home = File.expand_path("~#{Gitlab.config.gitlab_shell.ssh_user}") - if system("#{gitlab_shell_user_home}/gitlab-shell/support/rewrite-hooks.sh", Gitlab.config.gitlab_shell.repos_path) + if system("#{Gitlab.config.gitlab_shell.path}/support/rewrite-hooks.sh", Gitlab.config.gitlab_shell.repos_path) puts " [DONE]".green else puts " [FAILED]".red |