Skip to content
Snippets Groups Projects
Commit f885b461 authored by Jacob Vosmaer's avatar Jacob Vosmaer
Browse files

Patch gitlab-rails backup hooks restore bug

parent 991b5fbf
No related branches found
No related tags found
1 merge request!57Backup Restore Hooks
diff --git a/lib/backup/repository.rb b/lib/backup/repository.rb
index 20fd5ba..552f7ea 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
Loading
Loading
@@ -51,6 +51,9 @@ build do
# the GitLab backup script.
patch :source => "backup_uploads_realpath.patch"
 
# Patch the gitlab backup script to correctly restore gitlab-shell hooks
patch :source => "backup_restore_hooks.patch"
bundle "install --without mysql development test --path=#{install_dir}/embedded/service/gem", :env => env
 
# In order to precompile the assets, we need to get to a state where rake can
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment