diff options
| author | Douwe Maan <douwe@gitlab.com> | 2018-06-21 13:44:20 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2018-06-21 13:44:20 +0000 |
| commit | 94ac31e28b5de11b86a60e8dd56c472c777234a4 (patch) | |
| tree | b5148f36a876c0d26a0ede22a7c72a8bf64f0769 | |
| parent | e13aeab5a64bdaed74f2fff65d1bb905de4783ee (diff) | |
| parent | 099eb8ae407bf3cce0e01acc386055ad8151b68e (diff) | |
| download | gitlab-ce-94ac31e28b5de11b86a60e8dd56c472c777234a4.tar.gz | |
Merge branch 'restore-custom-hooks-wiki' into 'master'
Restore custom hooks for wiki
See merge request gitlab-org/gitlab-ce!20065
| -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 221ba52b490..50a5e340191 100644 --- a/lib/backup/repository.rb +++ b/lib/backup/repository.rb @@ -206,6 +206,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) |