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
Boxiang Sun
gitlab-ce
Commits
b8b82aa5
Commit
b8b82aa5
authored
May 11, 2018
by
DJ Mountney
Committed by
Ahmad Hassan
May 15, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the paths for wiki restore
parent
d5bd61e8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
7 deletions
+8
-7
lib/backup/repository.rb
lib/backup/repository.rb
+8
-7
No files found.
lib/backup/repository.rb
View file @
b8b82aa5
...
@@ -96,7 +96,7 @@ module Backup
...
@@ -96,7 +96,7 @@ module Backup
prepare_directories
prepare_directories
gitlab_shell
=
Gitlab
::
Shell
.
new
gitlab_shell
=
Gitlab
::
Shell
.
new
Project
.
find_each
(
batch_size:
1000
)
do
|
project
|
Project
.
find_each
(
batch_size:
1000
)
do
|
project
|
progress
.
print
" *
#{
project
.
name
}
... "
progress
.
print
" *
#{
project
.
full_path
}
... "
path_to_project_bundle
=
path_to_bundle
(
project
)
path_to_project_bundle
=
path_to_bundle
(
project
)
path_to_project_repo
=
path_to_repo
(
project
)
path_to_project_repo
=
path_to_repo
(
project
)
project
.
ensure_storage_path_exists
project
.
ensure_storage_path_exists
...
@@ -116,9 +116,9 @@ module Backup
...
@@ -116,9 +116,9 @@ module Backup
end
end
if
restore_repo_status
if
restore_repo_status
progress
.
puts
"[DONE]
restoring
#{
project
.
name
}
repository
"
.
color
(
:green
)
progress
.
puts
"[DONE]"
.
color
(
:green
)
else
else
progress
.
puts
"[Failed] restoring
#{
project
.
name
}
repository"
.
color
(
:red
)
progress
.
puts
"[Failed] restoring
#{
project
.
full_path
}
repository"
.
color
(
:red
)
end
end
gitaly_migrate
(
:restore_custom_hooks
)
do
|
is_enabled
|
gitaly_migrate
(
:restore_custom_hooks
)
do
|
is_enabled
|
...
@@ -139,12 +139,13 @@ module Backup
...
@@ -139,12 +139,13 @@ module Backup
path_to_wiki_bundle
=
path_to_bundle
(
wiki
)
path_to_wiki_bundle
=
path_to_bundle
(
wiki
)
if
File
.
exist?
(
path_to_wiki_bundle
)
if
File
.
exist?
(
path_to_wiki_bundle
)
progress
.
print
" *
#{
wiki
.
full_path
}
... "
begin
begin
gitlab_shell
.
remove_repository
(
project
.
wiki
.
repository_storage
,
project
.
wiki
.
disk_path
)
if
project
.
wiki_
repository_exists?
gitlab_shell
.
remove_repository
(
wiki
.
repository_storage
,
wiki
.
disk_path
)
if
wiki
.
repository_exists?
project
.
repository
.
create_from_bundle
(
path_to_wiki_bundle
)
wiki
.
repository
.
create_from_bundle
(
path_to_wiki_bundle
)
progress
.
puts
"[DONE]
restoring
#{
project
.
name
}
wiki
"
.
color
(
:green
)
progress
.
puts
"[DONE]"
.
color
(
:green
)
rescue
StandardError
=>
e
rescue
StandardError
=>
e
progress
.
puts
"[Failed] restoring
#{
project
.
name
}
wiki"
.
color
(
:red
)
progress
.
puts
"[Failed] restoring
#{
wiki
.
full_path
}
wiki"
.
color
(
:red
)
progress
.
puts
"Error
#{
e
}
"
.
color
(
:red
)
progress
.
puts
"Error
#{
e
}
"
.
color
(
:red
)
end
end
end
end
...
...
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