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
c6ff77d4
Commit
c6ff77d4
authored
Jul 24, 2016
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix backup restore
Set permissions of backup dir to g+s Closes #20188
parent
89872574
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
CHANGELOG
CHANGELOG
+1
-0
lib/backup/repository.rb
lib/backup/repository.rb
+2
-2
No files found.
CHANGELOG
View file @
c6ff77d4
...
@@ -11,6 +11,7 @@ v 8.11.0 (unreleased)
...
@@ -11,6 +11,7 @@ v 8.11.0 (unreleased)
v 8.10.2 (unreleased)
v 8.10.2 (unreleased)
- Use project ID in repository cache to prevent stale data from persisting across projects
- Use project ID in repository cache to prevent stale data from persisting across projects
- Fix backup restore
v 8.10.1 (unreleased)
v 8.10.1 (unreleased)
- Fix Error 500 when creating Wiki pages with hyphens or spaces
- Fix Error 500 when creating Wiki pages with hyphens or spaces
...
...
lib/backup/repository.rb
View file @
c6ff77d4
...
@@ -54,10 +54,10 @@ module Backup
...
@@ -54,10 +54,10 @@ module Backup
# Move repos dir to 'repositories.old' dir
# Move repos dir to 'repositories.old' dir
bk_repos_path
=
File
.
join
(
path
,
'..'
,
'repositories.old.'
+
Time
.
now
.
to_i
.
to_s
)
bk_repos_path
=
File
.
join
(
path
,
'..'
,
'repositories.old.'
+
Time
.
now
.
to_i
.
to_s
)
FileUtils
.
mv
(
path
,
bk_repos_path
)
FileUtils
.
mv
(
path
,
bk_repos_path
)
# This is expected from gitlab:check
FileUtils
.
mkdir_p
(
path
,
mode:
2770
)
end
end
FileUtils
.
mkdir_p
(
repos_path
)
Project
.
find_each
(
batch_size:
1000
)
do
|
project
|
Project
.
find_each
(
batch_size:
1000
)
do
|
project
|
$progress
.
print
" *
#{
project
.
path_with_namespace
}
... "
$progress
.
print
" *
#{
project
.
path_with_namespace
}
... "
...
...
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