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
Tatuya Kamada
gitlab-ce
Commits
2dff04f2
Commit
2dff04f2
authored
May 13, 2016
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed TODOs left
parent
8165e520
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
12 deletions
+10
-12
lib/gitlab/import_export.rb
lib/gitlab/import_export.rb
+8
-0
lib/gitlab/import_export/project_tree_saver.rb
lib/gitlab/import_export/project_tree_saver.rb
+1
-6
lib/gitlab/import_export/repo_bundler.rb
lib/gitlab/import_export/repo_bundler.rb
+1
-6
No files found.
lib/gitlab/import_export.rb
View file @
2dff04f2
...
@@ -9,5 +9,13 @@ module Gitlab
...
@@ -9,5 +9,13 @@ module Gitlab
def
storage_path
def
storage_path
File
.
join
(
Settings
.
shared
[
'path'
],
'tmp/project_exports'
)
File
.
join
(
Settings
.
shared
[
'path'
],
'tmp/project_exports'
)
end
end
def
project_filename
"project.json"
end
def
project_bundle_filename
"project.bundle"
end
end
end
end
end
lib/gitlab/import_export/project_tree_saver.rb
View file @
2dff04f2
...
@@ -6,7 +6,7 @@ module Gitlab
...
@@ -6,7 +6,7 @@ module Gitlab
def
initialize
(
project
:,
shared
:)
def
initialize
(
project
:,
shared
:)
@project
=
project
@project
=
project
@shared
=
shared
@shared
=
shared
@full_path
=
File
.
join
(
@shared
.
export_path
,
project_filename
)
@full_path
=
File
.
join
(
@shared
.
export_path
,
ImportExport
.
project_filename
)
end
end
def
save
def
save
...
@@ -20,11 +20,6 @@ module Gitlab
...
@@ -20,11 +20,6 @@ module Gitlab
private
private
# TODO remove magic keyword and move it to a shared config
def
project_filename
"project.json"
end
def
project_json_tree
def
project_json_tree
@project
.
to_json
(
Gitlab
::
ImportExport
::
ImportExportReader
.
new
(
shared:
@shared
).
project_tree
)
@project
.
to_json
(
Gitlab
::
ImportExport
::
ImportExportReader
.
new
(
shared:
@shared
).
project_tree
)
end
end
...
...
lib/gitlab/import_export/repo_bundler.rb
View file @
2dff04f2
...
@@ -12,7 +12,7 @@ module Gitlab
...
@@ -12,7 +12,7 @@ module Gitlab
def
bundle
def
bundle
return
false
if
@project
.
empty_repo?
return
false
if
@project
.
empty_repo?
@full_path
=
File
.
join
(
@shared
.
export_path
,
project
_filename
)
@full_path
=
File
.
join
(
@shared
.
export_path
,
ImportExport
.
project_bundle
_filename
)
bundle_to_disk
bundle_to_disk
end
end
...
@@ -26,11 +26,6 @@ module Gitlab
...
@@ -26,11 +26,6 @@ module Gitlab
false
false
end
end
# TODO remove magic keyword and move it to a shared config
def
project_filename
"project.bundle"
end
def
path_to_repo
def
path_to_repo
@project
.
repository
.
path_to_repo
@project
.
repository
.
path_to_repo
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