diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-06-21 13:44:20 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-06-25 12:56:05 +0100 |
commit | ec793011ea5679998103dc1edf142251412c171f (patch) | |
tree | 6396b88239ffd6ac884d3ae4178b9947c5670923 /lib | |
parent | b43e5a39f29c9c11c2685d7c59bf471913b54b6e (diff) | |
download | gitlab-ce-ec793011ea5679998103dc1edf142251412c171f.tar.gz |
Merge branch 'restore-custom-hooks-wiki' into 'master'
Restore custom hooks for wiki
See merge request gitlab-org/gitlab-ce!20065
Diffstat (limited to 'lib')
-rw-r--r-- | lib/backup/repository.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/backup/repository.rb b/lib/backup/repository.rb index 1b1c83d9fb3..b0073a5f1ae 100644 --- a/lib/backup/repository.rb +++ b/lib/backup/repository.rb @@ -165,6 +165,8 @@ module Backup progress.print " * #{wiki.full_path} ... " begin wiki.repository.create_from_bundle(path_to_wiki_bundle) + restore_custom_hooks(wiki) + progress.puts "[DONE]".color(:green) rescue => e progress.puts "[Failed] restoring #{wiki.full_path} wiki".color(:red) |