summaryrefslogtreecommitdiff
path: root/lib/backup
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2017-03-28 16:24:40 +0200
committerJacob Vosmaer <jacob@gitlab.com>2017-03-29 14:48:06 +0200
commit65b68338e7ae05ccf4aa9d35430845a0f999506e (patch)
tree494fbfb51ea87ef22df5b19c5ad2eb0da6261030 /lib/backup
parent6b8c2ea866c387e9a8a1ccdc079ecebad9509897 (diff)
downloadgitlab-ce-65b68338e7ae05ccf4aa9d35430845a0f999506e.tar.gz
Fix custom hooks restore
Diffstat (limited to 'lib/backup')
-rw-r--r--lib/backup/repository.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/backup/repository.rb b/lib/backup/repository.rb
index cd745d35e7c..6b29600a751 100644
--- a/lib/backup/repository.rb
+++ b/lib/backup/repository.rb
@@ -182,7 +182,9 @@ module Backup
dir_entries = Dir.entries(path)
- yield('custom_hooks') if dir_entries.include?('custom_hooks')
+ if dir_entries.include?('custom_hooks') || dir_entries.include?('custom_hooks.tar')
+ yield('custom_hooks')
+ end
end
def prepare