Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
97c3aff1
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
97c3aff1
编写于
4月 14, 2016
作者:
J
James Lopez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
refactored import stuff, moved to lib
上级
adbcccb4
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
13 addition
and
13 deletion
+13
-13
app/services/projects/import_export/import_service.rb
app/services/projects/import_export/import_service.rb
+1
-1
lib/gitlab/import_export/members_mapper.rb
lib/gitlab/import_export/members_mapper.rb
+1
-1
lib/gitlab/import_export/project_factory.rb
lib/gitlab/import_export/project_factory.rb
+1
-1
lib/gitlab/import_export/project_tree_restorer.rb
lib/gitlab/import_export/project_tree_restorer.rb
+5
-5
lib/gitlab/import_export/relation_factory.rb
lib/gitlab/import_export/relation_factory.rb
+1
-1
spec/lib/gitlab/import_export/members_mapper_spec.rb
spec/lib/gitlab/import_export/members_mapper_spec.rb
+2
-2
spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
spec/lib/gitlab/import_export/project_tree_restorer_spec.rb
+2
-2
未找到文件。
app/services/projects/import_export/import_service.rb
浏览文件 @
97c3aff1
...
@@ -8,7 +8,7 @@ module Projects
...
@@ -8,7 +8,7 @@ module Projects
private
private
def
restore_project_tree
def
restore_project_tree
Projects
::
ImportExport
::
ProjectTreeRestorer
.
new
(
path:
@import_path
).
restore
Gitlab
::
ImportExport
::
ProjectTreeRestorer
.
new
(
path:
@import_path
).
restore
end
end
def
restore_repo
def
restore_repo
...
...
app/services/projects
/import_export/members_mapper.rb
→
lib/gitlab
/import_export/members_mapper.rb
浏览文件 @
97c3aff1
module
Projects
module
Gitlab
module
ImportExport
module
ImportExport
class
MembersMapper
class
MembersMapper
...
...
app/services/projects
/import_export/project_factory.rb
→
lib/gitlab
/import_export/project_factory.rb
浏览文件 @
97c3aff1
module
Projects
module
Gitlab
module
ImportExport
module
ImportExport
module
ProjectFactory
module
ProjectFactory
extend
self
extend
self
...
...
app/services/projects
/import_export/project_tree_restorer.rb
→
lib/gitlab
/import_export/project_tree_restorer.rb
浏览文件 @
97c3aff1
module
Projects
module
Gitlab
module
ImportExport
module
ImportExport
class
ProjectTreeRestorer
class
ProjectTreeRestorer
attr_reader
:project
attr_reader
:project
...
@@ -18,7 +18,7 @@ module Projects
...
@@ -18,7 +18,7 @@ module Projects
private
private
def
members_map
def
members_map
@members
||=
Projects
::
ImportExport
::
MembersMapper
.
map
(
@members
||=
Gitlab
::
ImportExport
::
MembersMapper
.
map
(
exported_members:
@project_members
,
user:
@user
,
project_id:
project
.
id
)
exported_members:
@project_members
,
user:
@user
,
project_id:
project
.
id
)
end
end
...
@@ -37,7 +37,7 @@ module Projects
...
@@ -37,7 +37,7 @@ module Projects
end
end
def
default_relation_list
def
default_relation_list
Projects
::
ImportExport
::
ImportExportReader
.
tree
.
reject
{
|
model
|
model
.
is_a?
(
Hash
)
&&
model
[
:project_members
]
}
Gitlab
::
ImportExport
::
ImportExportReader
.
tree
.
reject
{
|
model
|
model
.
is_a?
(
Hash
)
&&
model
[
:project_members
]
}
end
end
def
project
def
project
...
@@ -46,7 +46,7 @@ module Projects
...
@@ -46,7 +46,7 @@ module Projects
def
create_project
def
create_project
project_params
=
@tree_hash
.
reject
{
|
_key
,
value
|
value
.
is_a?
(
Array
)
}
project_params
=
@tree_hash
.
reject
{
|
_key
,
value
|
value
.
is_a?
(
Array
)
}
project
=
Projects
::
ImportExport
::
ProjectFactory
.
create
(
project
=
Gitlab
::
ImportExport
::
ProjectFactory
.
create
(
project_params:
project_params
,
user:
@user
)
project_params:
project_params
,
user:
@user
)
project
.
save
project
.
save
project
project
...
@@ -79,7 +79,7 @@ module Projects
...
@@ -79,7 +79,7 @@ module Projects
end
end
def
relation_from_factory
(
relation
,
relation_hash
)
def
relation_from_factory
(
relation
,
relation_hash
)
Projects
::
ImportExport
::
RelationFactory
.
create
(
Gitlab
::
ImportExport
::
RelationFactory
.
create
(
relation_sym:
relation
,
relation_hash:
relation_hash
.
merge
(
'project_id'
=>
project
.
id
),
members_map:
members_map
)
relation_sym:
relation
,
relation_hash:
relation_hash
.
merge
(
'project_id'
=>
project
.
id
),
members_map:
members_map
)
end
end
end
end
...
...
app/services/projects
/import_export/relation_factory.rb
→
lib/gitlab
/import_export/relation_factory.rb
浏览文件 @
97c3aff1
module
Projects
module
Gitlab
module
ImportExport
module
ImportExport
module
RelationFactory
module
RelationFactory
extend
self
extend
self
...
...
spec/
services/projects
/import_export/members_mapper_spec.rb
→
spec/
lib/gitlab
/import_export/members_mapper_spec.rb
浏览文件 @
97c3aff1
require
'spec_helper'
require
'spec_helper'
describe
Projects
::
ImportExport
::
MembersMapper
,
services:
true
do
describe
Gitlab
::
ImportExport
::
MembersMapper
,
services:
true
do
describe
:map
do
describe
:map
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
...
@@ -31,7 +31,7 @@ describe Projects::ImportExport::MembersMapper, services: true do
...
@@ -31,7 +31,7 @@ describe Projects::ImportExport::MembersMapper, services: true do
end
end
let
(
:members_mapper
)
do
let
(
:members_mapper
)
do
Projects
::
ImportExport
::
MembersMapper
.
new
(
Gitlab
::
ImportExport
::
MembersMapper
.
new
(
exported_members:
exported_members
,
user:
user
,
project_id:
project
.
id
)
exported_members:
exported_members
,
user:
user
,
project_id:
project
.
id
)
end
end
...
...
spec/
services/projects
/import_export/project_tree_restorer_spec.rb
→
spec/
lib/gitlab
/import_export/project_tree_restorer_spec.rb
浏览文件 @
97c3aff1
require
'spec_helper'
require
'spec_helper'
describe
Projects
::
ImportExport
::
ProjectTreeRestorer
,
services:
true
do
describe
Gitlab
::
ImportExport
::
ProjectTreeRestorer
,
services:
true
do
describe
:restore
do
describe
:restore
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:user
)
{
create
(
:user
)
}
let
(
:project_tree_restorer
)
{
Projects
::
ImportExport
::
ProjectTreeRestorer
.
new
(
path:
"fixtures/import_export/project.json"
,
user:
user
)
}
let
(
:project_tree_restorer
)
{
Gitlab
::
ImportExport
::
ProjectTreeRestorer
.
new
(
path:
"fixtures/import_export/project.json"
,
user:
user
)
}
context
'JSON'
do
context
'JSON'
do
let
(
:restored_project_json
)
do
let
(
:restored_project_json
)
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录