Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
f04e9dad
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,体验更适合开发者的 AI 搜索 >>
提交
f04e9dad
编写于
8月 05, 2016
作者:
J
James Lopez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Support pending invitation project members importing projects
上级
685c048d
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
29 addition
and
5 deletion
+29
-5
CHANGELOG
CHANGELOG
+1
-0
lib/gitlab/import_export/members_mapper.rb
lib/gitlab/import_export/members_mapper.rb
+8
-5
spec/lib/gitlab/import_export/members_mapper_spec.rb
spec/lib/gitlab/import_export/members_mapper_spec.rb
+20
-0
未找到文件。
CHANGELOG
浏览文件 @
f04e9dad
...
...
@@ -73,6 +73,7 @@ v 8.11.0 (unreleased)
- Add description to new_issue email and new_merge_request_email in text/plain content type. !5663 (dixpac)
- Speed up and reduce memory usage of Commit#repo_changes, Repository#expire_avatar_cache and IrkerWorker
- Add unfold links for Side-by-Side view. !5415 (Tim Masliuchenko)
- Adds support for pending invitation project members importing projects
v 8.10.5 (unreleased)
...
...
lib/gitlab/import_export/members_mapper.rb
浏览文件 @
f04e9dad
...
...
@@ -18,11 +18,14 @@ module Gitlab
@map
||=
begin
@exported_members
.
inject
(
missing_keys_tracking_hash
)
do
|
hash
,
member
|
existing_user
=
User
.
where
(
find_project_user_query
(
member
)).
first
old_user_id
=
member
[
'user'
][
'id'
]
if
existing_user
&&
add_user_as_team_member
(
existing_user
,
member
)
hash
[
old_user_id
]
=
existing_user
.
id
if
member
[
'user'
]
old_user_id
=
member
[
'user'
][
'id'
]
existing_user
=
User
.
where
(
find_project_user_query
(
member
)).
first
hash
[
old_user_id
]
=
existing_user
.
id
if
existing_user
&&
add_team_member
(
member
,
existing_user
)
else
add_team_member
(
member
)
end
hash
end
end
...
...
@@ -45,7 +48,7 @@ module Gitlab
ProjectMember
.
create!
(
user:
@user
,
access_level:
ProjectMember
::
MASTER
,
source_id:
@project
.
id
,
importing:
true
)
end
def
add_
user_as_team_member
(
existing_user
,
member
)
def
add_
team_member
(
member
,
existing_user
=
nil
)
member
[
'user'
]
=
existing_user
ProjectMember
.
create
(
member_hash
(
member
)).
persisted?
...
...
spec/lib/gitlab/import_export/members_mapper_spec.rb
浏览文件 @
f04e9dad
...
...
@@ -26,6 +26,20 @@ describe Gitlab::ImportExport::MembersMapper, services: true do
"email"
=>
user2
.
email
,
"username"
=>
user2
.
username
}
},
{
"id"
=>
3
,
"access_level"
=>
40
,
"source_id"
=>
14
,
"source_type"
=>
"Project"
,
"user_id"
=>
nil
,
"notification_level"
=>
3
,
"created_at"
=>
"2016-03-11T10:21:44.822Z"
,
"updated_at"
=>
"2016-03-11T10:21:44.822Z"
,
"created_by_id"
=>
1
,
"invite_email"
=>
'invite@test.com'
,
"invite_token"
=>
'token'
,
"invite_accepted_at"
=>
nil
}]
end
...
...
@@ -47,5 +61,11 @@ describe Gitlab::ImportExport::MembersMapper, services: true do
expect
(
members_mapper
.
missing_author_ids
.
first
).
to
eq
(
-
1
)
end
it
'has invited members with no user'
do
members_mapper
.
map
expect
(
ProjectMember
.
find_by_invite_email
(
'invite@test.com'
)).
not_to
be_nil
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录