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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
880478b2
Commit
880478b2
authored
Nov 29, 2014
by
Achilleas Pipinellis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Proper wiki restore. Fixes #845
parent
27cd35de
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
9 deletions
+13
-9
CHANGELOG
CHANGELOG
+1
-1
lib/backup/repository.rb
lib/backup/repository.rb
+12
-8
No files found.
CHANGELOG
View file @
880478b2
...
...
@@ -2,7 +2,7 @@ v 7.6.0
- Fork repository to groups
- New rugged version
- Add CRON=1 backup setting for quiet backups
-
-
Fix failing wiki restore
-
- Add optional Sidekiq MemoryKiller middleware (enabled via SIDEKIQ_MAX_RSS env variable)
-
...
...
lib/backup/repository.rb
View file @
880478b2
...
...
@@ -79,16 +79,20 @@ module Backup
wiki
=
ProjectWiki
.
new
(
project
)
$progress
.
print
" *
#{
wiki
.
path_with_namespace
}
... "
if
File
.
exists?
(
path_to_bundle
(
wiki
))
$progress
.
print
" *
#{
wiki
.
path_with_namespace
}
... "
cmd
=
%W(git clone --bare
#{
path_to_bundle
(
wiki
)
}
#{
path_to_repo
(
wiki
)
}
)
if
system
(
*
cmd
,
silent
)
$progress
.
puts
" [DONE]"
.
green
else
puts
" [FAILED]"
.
red
puts
"failed:
#{
cmd
.
join
(
' '
)
}
"
abort
'Restore failed'
end
else
cmd
=
%W(git init --bare
#{
path_to_repo
(
wiki
)
}
)
end
if
system
(
*
cmd
,
silent
)
$progress
.
puts
" [DONE]"
.
green
else
puts
" [FAILED]"
.
red
puts
"failed:
#{
cmd
.
join
(
' '
)
}
"
abort
'Restore failed'
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