Commit 9c4f9677 authored by Ahmad Hassan's avatar Ahmad Hassan

Take restoring custom hooks and the skip flag out of scope

parent 80197bdc
...@@ -70,8 +70,6 @@ module Backup ...@@ -70,8 +70,6 @@ module Backup
# TODO: Need to find a way to do this for gitaly # TODO: Need to find a way to do this for gitaly
# Gitaly discussion issue: https://gitlab.com/gitlab-org/gitaly/issues/1194 # Gitaly discussion issue: https://gitlab.com/gitlab-org/gitaly/issues/1194
return if Gitlab::GitalyClient.feature_enabled?(:backup_skip_prepare_directories)
Gitlab.config.repositories.storages.each do |name, repository_storage| Gitlab.config.repositories.storages.each do |name, repository_storage|
path = repository_storage.legacy_disk_path path = repository_storage.legacy_disk_path
next unless File.exist?(path) next unless File.exist?(path)
...@@ -92,7 +90,7 @@ module Backup ...@@ -92,7 +90,7 @@ module Backup
end end
end end
def restore_custom_hooks def restore_custom_hooks(project)
# TODO: Need to find a way to do this for gitaly # TODO: Need to find a way to do this for gitaly
# Gitaly migration issue: https://gitlab.com/gitlab-org/gitaly/issues/1195 # Gitaly migration issue: https://gitlab.com/gitlab-org/gitaly/issues/1195
in_path(path_to_tars(project)) do |dir| in_path(path_to_tars(project)) do |dir|
...@@ -134,7 +132,7 @@ module Backup ...@@ -134,7 +132,7 @@ module Backup
progress.puts "[Failed] restoring #{project.full_path} repository".color(:red) progress.puts "[Failed] restoring #{project.full_path} repository".color(:red)
end end
restore_custom_hooks unless Gitlab::GitalyClient.feature_enabled?(:backup_skip_restore_custom_hooks) restore_custom_hooks(project)
wiki = ProjectWiki.new(project) wiki = ProjectWiki.new(project)
path_to_wiki_bundle = path_to_bundle(wiki) path_to_wiki_bundle = path_to_bundle(wiki)
......
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