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
7d8542ab
Commit
7d8542ab
authored
Feb 28, 2020
by
Henrik Christian Grove
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use File.join instead of string interpolation
parent
49e58b9e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
lib/backup/manager.rb
lib/backup/manager.rb
+3
-1
No files found.
lib/backup/manager.rb
View file @
7d8542ab
...
...
@@ -126,6 +126,7 @@ module Backup
def
unpack
Dir
.
chdir
(
backup_path
)
do
if
ENV
[
'BACKUP'
].
present?
# User has indicated which backup to restore
tar_file
=
File
.
basename
(
ENV
[
'BACKUP'
])
+
FILE_NAME_SUFFIX
...
...
@@ -151,6 +152,7 @@ module Backup
progress
.
puts
'rake gitlab:backup:restore BACKUP=timestamp_of_backup'
exit
1
end
tar_file
=
backup_file_list
.
first
progress
.
print
'Unpacking backup ... '
...
...
@@ -258,7 +260,7 @@ module Backup
def
create_attributes
attrs
=
{
key:
remote_target
,
body:
File
.
open
(
"
#{
backup_path
}
/
#{
tar_file
}
"
),
body:
File
.
open
(
File
.
join
(
backup_path
,
tar_file
)
),
multipart_chunk_size:
Gitlab
.
config
.
backup
.
upload
.
multipart_chunk_size
,
encryption:
Gitlab
.
config
.
backup
.
upload
.
encryption
,
encryption_key:
Gitlab
.
config
.
backup
.
upload
.
encryption_key
,
...
...
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