summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAhmad Hassan <ahmad.hassan612@gmail.com>2018-06-19 16:26:39 +0200
committerAhmad Hassan <ahmad.hassan612@gmail.com>2018-06-20 11:43:59 +0200
commit9d7e73277ec65edfbcad269c1038ea0bb24e7427 (patch)
treedb14af947c886d3579855a7deb061c31ecc40639
parent5308b51ef43dceb3832edb4156bf3ece51099b67 (diff)
downloadgitlab-ce-use-backup-custom-hooks-gitaly.tar.gz
Move backup custom hooks up a leveluse-backup-custom-hooks-gitaly
-rw-r--r--lib/backup/repository.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/backup/repository.rb b/lib/backup/repository.rb
index 605a913cc6f..221ba52b490 100644
--- a/lib/backup/repository.rb
+++ b/lib/backup/repository.rb
@@ -55,6 +55,8 @@ module Backup
backup_project_local(project)
end
end
+
+ backup_custom_hooks(project)
rescue => e
progress_warn(project, e, 'Failed to backup repo')
end
@@ -63,8 +65,6 @@ module Backup
path_to_project_bundle = path_to_bundle(project)
Gitlab::GitalyClient::RepositoryService.new(project.repository)
.create_bundle(path_to_project_bundle)
-
- backup_custom_hooks(project)
end
def backup_project_local(project)
@@ -74,8 +74,6 @@ module Backup
path_to_project_bundle = path_to_bundle(project)
- backup_custom_hooks(project)
-
cmd = %W(#{Gitlab.config.git.bin_path} --git-dir=#{path_to_project_repo} bundle create #{path_to_project_bundle} --all)
output, status = Gitlab::Popen.popen(cmd)
progress_warn(project, cmd.join(' '), output) unless status.zero?