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
Jérome Perrin
gitlab-ce
Commits
c46f3bcb
Commit
c46f3bcb
authored
Apr 29, 2016
by
James Lopez
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
few fixes and new integration spec -WIP
parent
c5bc2629
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
2 deletions
+23
-2
lib/gitlab/import_export/project_tree_restorer.rb
lib/gitlab/import_export/project_tree_restorer.rb
+0
-1
lib/gitlab/import_export/repo_restorer.rb
lib/gitlab/import_export/repo_restorer.rb
+1
-1
spec/features/projects/import_export/import_file_spec.rb
spec/features/projects/import_export/import_file_spec.rb
+22
-0
spec/features/projects/import_export/test_project_export.tar.gz
...eatures/projects/import_export/test_project_export.tar.gz
+0
-0
No files found.
lib/gitlab/import_export/project_tree_restorer.rb
View file @
c46f3bcb
...
@@ -66,7 +66,6 @@ module Gitlab
...
@@ -66,7 +66,6 @@ module Gitlab
end
end
def
process_sub_relation
(
relation_hash
,
relation_item
,
sub_relation
)
def
process_sub_relation
(
relation_hash
,
relation_item
,
sub_relation
)
sub_relation_object
=
nil
if
relation_hash
.
is_a?
(
Array
)
if
relation_hash
.
is_a?
(
Array
)
sub_relation_object
=
create_relation
(
sub_relation
,
relation_hash
)
sub_relation_object
=
create_relation
(
sub_relation
,
relation_hash
)
else
else
...
...
lib/gitlab/import_export/repo_restorer.rb
View file @
c46f3bcb
...
@@ -14,7 +14,7 @@ module Gitlab
...
@@ -14,7 +14,7 @@ module Gitlab
FileUtils
.
mkdir_p
(
repos_path
)
FileUtils
.
mkdir_p
(
repos_path
)
FileUtils
.
mkdir_p
(
path_to_repo
)
FileUtils
.
mkdir_p
(
path_to_repo
)
untar_
cz
f
(
archive:
@path
,
dir:
path_to_repo
)
untar_
zx
f
(
archive:
@path
,
dir:
path_to_repo
)
end
end
private
private
...
...
spec/features/projects/import_export/import_file_spec.rb
0 → 100644
View file @
c46f3bcb
require
'spec_helper'
feature
'project import'
,
feature:
true
,
js:
true
do
include
Select2Helper
let
(
:user
)
{
create
(
:user
)
}
let!
(
:namespace
)
{
create
(
:namespace
,
name:
"asd"
,
owner:
user
)
}
background
do
login_as
(
user
)
end
scenario
'user imports an exported project successfully'
do
visit
new_project_path
select2
(
'asd'
,
from:
'#project_namespace_id'
)
fill_in
:project_path
,
with
:'test-project-path'
,
visible:
true
click_link
'GitLab project'
expect
(
page
).
to
have_content
(
'GitLab export file'
)
expect
(
URI
.
parse
(
current_url
).
query
).
to
eq
(
'namespace_id=asd&path=test-project-path'
)
end
end
spec/features/projects/import_export/test_project_export.tar.gz
0 → 100644
View file @
c46f3bcb
File added
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