Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
80197bdc
Commit
80197bdc
authored
May 21, 2018
by
Ahmad Hassan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove gitaly_migrate blocks and replace by early return
parent
125be186
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
26 additions
and
33 deletions
+26
-33
lib/backup/repository.rb
lib/backup/repository.rb
+26
-33
No files found.
lib/backup/repository.rb
View file @
80197bdc
...
...
@@ -67,13 +67,12 @@ module Backup
end
def
prepare_directories
# TODO: Need to find a way to do this for gitaly
# 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
|
gitaly_migrate
(
:remove_repositories
)
do
|
is_enabled
|
# TODO: Need to find a way to do this for gitaly
# Gitaly discussion issue: https://gitlab.com/gitlab-org/gitaly/issues/1194
unless
is_enabled
path
=
repository_storage
.
legacy_disk_path
next
unless
File
.
exist?
(
path
)
...
...
@@ -92,14 +91,10 @@ module Backup
end
end
end
end
end
def
restore_custom_hooks
gitaly_migrate
(
:restore_custom_hooks
)
do
|
is_enabled
|
# TODO: Need to find a way to do this for gitaly
# Gitaly migration issue: https://gitlab.com/gitlab-org/gitaly/issues/1195
unless
is_enabled
in_path
(
path_to_tars
(
project
))
do
|
dir
|
path_to_project_repo
=
path_to_repo
(
project
)
cmd
=
%W(tar -xf
#{
path_to_tars
(
project
,
dir
)
}
-C
#{
path_to_project_repo
}
#{
dir
}
)
...
...
@@ -110,8 +105,6 @@ module Backup
end
end
end
end
end
def
restore
prepare_directories
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment