Commit 94ac31e2 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'restore-custom-hooks-wiki' into 'master'

Restore custom hooks for wiki

See merge request gitlab-org/gitlab-ce!20065
parents e13aeab5 099eb8ae
...@@ -206,6 +206,8 @@ module Backup ...@@ -206,6 +206,8 @@ module Backup
progress.print " * #{wiki.full_path} ... " progress.print " * #{wiki.full_path} ... "
begin begin
wiki.repository.create_from_bundle(path_to_wiki_bundle) wiki.repository.create_from_bundle(path_to_wiki_bundle)
restore_custom_hooks(wiki)
progress.puts "[DONE]".color(:green) progress.puts "[DONE]".color(:green)
rescue => e rescue => e
progress.puts "[Failed] restoring #{wiki.full_path} wiki".color(:red) progress.puts "[Failed] restoring #{wiki.full_path} wiki".color(:red)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment