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
958d9f11
Commit
958d9f11
authored
Sep 29, 2016
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix export project file permissions issue
parent
08bab4bb
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
27 additions
and
7 deletions
+27
-7
CHANGELOG
CHANGELOG
+3
-0
lib/gitlab/import_export/command_line_util.rb
lib/gitlab/import_export/command_line_util.rb
+8
-1
lib/gitlab/import_export/file_importer.rb
lib/gitlab/import_export/file_importer.rb
+1
-1
lib/gitlab/import_export/project_tree_saver.rb
lib/gitlab/import_export/project_tree_saver.rb
+3
-1
lib/gitlab/import_export/repo_restorer.rb
lib/gitlab/import_export/repo_restorer.rb
+1
-1
lib/gitlab/import_export/repo_saver.rb
lib/gitlab/import_export/repo_saver.rb
+1
-1
lib/gitlab/import_export/version_saver.rb
lib/gitlab/import_export/version_saver.rb
+3
-1
lib/gitlab/import_export/wiki_repo_saver.rb
lib/gitlab/import_export/wiki_repo_saver.rb
+1
-1
spec/features/projects/import_export/export_file_spec.rb
spec/features/projects/import_export/export_file_spec.rb
+2
-0
spec/support/import_export/export_file_helper.rb
spec/support/import_export/export_file_helper.rb
+4
-0
No files found.
CHANGELOG
View file @
958d9f11
...
@@ -3,6 +3,9 @@ Please view this file on the master branch, on stable branches it's out of date.
...
@@ -3,6 +3,9 @@ Please view this file on the master branch, on stable branches it's out of date.
v 8.13.0 (unreleased)
v 8.13.0 (unreleased)
- Speed-up group milestones show page
- Speed-up group milestones show page
v 8.12.4 (unreleased)
- Set GitLab project exported file permissions to owner only
v 8.12.2 (unreleased)
v 8.12.2 (unreleased)
- Fix Import/Export not recognising correctly the imported services.
- Fix Import/Export not recognising correctly the imported services.
- Respect the fork_project permission when forking projects
- Respect the fork_project permission when forking projects
...
...
lib/gitlab/import_export/command_line_util.rb
View file @
958d9f11
module
Gitlab
module
Gitlab
module
ImportExport
module
ImportExport
module
CommandLineUtil
module
CommandLineUtil
DEFAULT_MODE
=
0700
def
tar_czf
(
archive
:,
dir
:)
def
tar_czf
(
archive
:,
dir
:)
tar_with_options
(
archive:
archive
,
dir:
dir
,
options:
'czf'
)
tar_with_options
(
archive:
archive
,
dir:
dir
,
options:
'czf'
)
end
end
...
@@ -21,6 +23,11 @@ module Gitlab
...
@@ -21,6 +23,11 @@ module Gitlab
execute
(
%W(
#{
Gitlab
.
config
.
gitlab_shell
.
path
}
/bin/create-hooks)
+
repository_storage_paths_args
)
execute
(
%W(
#{
Gitlab
.
config
.
gitlab_shell
.
path
}
/bin/create-hooks)
+
repository_storage_paths_args
)
end
end
def
mkdir_p
(
path
)
FileUtils
.
mkdir_p
(
path
,
mode:
DEFAULT_MODE
)
FileUtils
.
chmod
(
DEFAULT_MODE
,
path
)
end
private
private
def
tar_with_options
(
archive
:,
dir
:,
options
:)
def
tar_with_options
(
archive
:,
dir
:,
options
:)
...
@@ -45,7 +52,7 @@ module Gitlab
...
@@ -45,7 +52,7 @@ module Gitlab
# if we are copying files, create the destination folder
# if we are copying files, create the destination folder
destination_folder
=
File
.
file?
(
source
)
?
File
.
dirname
(
destination
)
:
destination
destination_folder
=
File
.
file?
(
source
)
?
File
.
dirname
(
destination
)
:
destination
FileUtils
.
mkdir_p
(
destination_folder
)
mkdir_p
(
destination_folder
)
FileUtils
.
copy_entry
(
source
,
destination
)
FileUtils
.
copy_entry
(
source
,
destination
)
true
true
end
end
...
...
lib/gitlab/import_export/file_importer.rb
View file @
958d9f11
...
@@ -15,7 +15,7 @@ module Gitlab
...
@@ -15,7 +15,7 @@ module Gitlab
end
end
def
import
def
import
FileUtils
.
mkdir_p
(
@shared
.
export_path
)
mkdir_p
(
@shared
.
export_path
)
wait_for_archived_file
do
wait_for_archived_file
do
decompress_archive
decompress_archive
...
...
lib/gitlab/import_export/project_tree_saver.rb
View file @
958d9f11
module
Gitlab
module
Gitlab
module
ImportExport
module
ImportExport
class
ProjectTreeSaver
class
ProjectTreeSaver
include
Gitlab
::
ImportExport
::
CommandLineUtil
attr_reader
:full_path
attr_reader
:full_path
def
initialize
(
project
:,
shared
:)
def
initialize
(
project
:,
shared
:)
...
@@ -10,7 +12,7 @@ module Gitlab
...
@@ -10,7 +12,7 @@ module Gitlab
end
end
def
save
def
save
FileUtils
.
mkdir_p
(
@shared
.
export_path
)
mkdir_p
(
@shared
.
export_path
)
File
.
write
(
full_path
,
project_json_tree
)
File
.
write
(
full_path
,
project_json_tree
)
true
true
...
...
lib/gitlab/import_export/repo_restorer.rb
View file @
958d9f11
...
@@ -12,7 +12,7 @@ module Gitlab
...
@@ -12,7 +12,7 @@ module Gitlab
def
restore
def
restore
return
true
unless
File
.
exist?
(
@path_to_bundle
)
return
true
unless
File
.
exist?
(
@path_to_bundle
)
FileUtils
.
mkdir_p
(
path_to_repo
)
mkdir_p
(
path_to_repo
)
git_unbundle
(
repo_path:
path_to_repo
,
bundle_path:
@path_to_bundle
)
&&
repo_restore_hooks
git_unbundle
(
repo_path:
path_to_repo
,
bundle_path:
@path_to_bundle
)
&&
repo_restore_hooks
rescue
=>
e
rescue
=>
e
...
...
lib/gitlab/import_export/repo_saver.rb
View file @
958d9f11
...
@@ -20,7 +20,7 @@ module Gitlab
...
@@ -20,7 +20,7 @@ module Gitlab
private
private
def
bundle_to_disk
def
bundle_to_disk
FileUtils
.
mkdir_p
(
@shared
.
export_path
)
mkdir_p
(
@shared
.
export_path
)
git_bundle
(
repo_path:
path_to_repo
,
bundle_path:
@full_path
)
git_bundle
(
repo_path:
path_to_repo
,
bundle_path:
@full_path
)
rescue
=>
e
rescue
=>
e
@shared
.
error
(
e
)
@shared
.
error
(
e
)
...
...
lib/gitlab/import_export/version_saver.rb
View file @
958d9f11
module
Gitlab
module
Gitlab
module
ImportExport
module
ImportExport
class
VersionSaver
class
VersionSaver
include
Gitlab
::
ImportExport
::
CommandLineUtil
def
initialize
(
shared
:)
def
initialize
(
shared
:)
@shared
=
shared
@shared
=
shared
end
end
def
save
def
save
FileUtils
.
mkdir_p
(
@shared
.
export_path
)
mkdir_p
(
@shared
.
export_path
)
File
.
write
(
version_file
,
Gitlab
::
ImportExport
.
version
,
mode:
'w'
)
File
.
write
(
version_file
,
Gitlab
::
ImportExport
.
version
,
mode:
'w'
)
rescue
=>
e
rescue
=>
e
...
...
lib/gitlab/import_export/wiki_repo_saver.rb
View file @
958d9f11
...
@@ -9,7 +9,7 @@ module Gitlab
...
@@ -9,7 +9,7 @@ module Gitlab
end
end
def
bundle_to_disk
(
full_path
)
def
bundle_to_disk
(
full_path
)
FileUtils
.
mkdir_p
(
@shared
.
export_path
)
mkdir_p
(
@shared
.
export_path
)
git_bundle
(
repo_path:
path_to_repo
,
bundle_path:
full_path
)
git_bundle
(
repo_path:
path_to_repo
,
bundle_path:
full_path
)
rescue
=>
e
rescue
=>
e
@shared
.
error
(
e
)
@shared
.
error
(
e
)
...
...
spec/features/projects/import_export/export_file_spec.rb
View file @
958d9f11
...
@@ -47,6 +47,8 @@ feature 'Import/Export - project export integration test', feature: true, js: tr
...
@@ -47,6 +47,8 @@ feature 'Import/Export - project export integration test', feature: true, js: tr
expect
(
page
).
to
have_content
(
'Download export'
)
expect
(
page
).
to
have_content
(
'Download export'
)
expect
(
file_permissions
(
project
.
export_path
)).
to
eq
(
0700
)
in_directory_with_expanded_export
(
project
)
do
|
exit_status
,
tmpdir
|
in_directory_with_expanded_export
(
project
)
do
|
exit_status
,
tmpdir
|
expect
(
exit_status
).
to
eq
(
0
)
expect
(
exit_status
).
to
eq
(
0
)
...
...
spec/support/import_export/export_file_helper.rb
View file @
958d9f11
...
@@ -130,4 +130,8 @@ module ExportFileHelper
...
@@ -130,4 +130,8 @@ module ExportFileHelper
(
parsed_model_attributes
-
parent
.
keys
-
excluded_attributes
).
empty?
(
parsed_model_attributes
-
parent
.
keys
-
excluded_attributes
).
empty?
end
end
def
file_permissions
(
file
)
File
.
stat
(
file
).
mode
&
0777
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