Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
30d91511
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,发现更多精彩内容 >>
提交
30d91511
编写于
5月 23, 2019
作者:
J
James Lopez
提交者:
Jan Provaznik
5月 23, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix issue importing members with owner access
上级
bd1ef521
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
18 addition
and
1 deletion
+18
-1
changelogs/unreleased/fix-import-member-access.yml
changelogs/unreleased/fix-import-member-access.yml
+5
-0
doc/user/project/settings/import_export.md
doc/user/project/settings/import_export.md
+1
-0
lib/gitlab/import_export/members_mapper.rb
lib/gitlab/import_export/members_mapper.rb
+5
-1
spec/lib/gitlab/import_export/members_mapper_spec.rb
spec/lib/gitlab/import_export/members_mapper_spec.rb
+7
-0
未找到文件。
changelogs/unreleased/fix-import-member-access.yml
0 → 100644
浏览文件 @
30d91511
---
title
:
Fix issue importing members with owner access
merge_request
:
28636
author
:
type
:
fixed
doc/user/project/settings/import_export.md
浏览文件 @
30d91511
...
...
@@ -23,6 +23,7 @@
> in the import side is required to map the users, based on email or username.
> Otherwise, a supplementary comment is left to mention the original author and
> the MRs, notes or issues will be owned by the importer.
> - Project members with owner access will get imported as maintainers.
> - Control project Import/Export with the [API](../../../api/project_import_export.md).
> - If an imported project contains merge requests originated from forks,
> then new branches associated with such merge requests will be created
...
...
lib/gitlab/import_export/members_mapper.rb
浏览文件 @
30d91511
...
...
@@ -59,7 +59,11 @@ module Gitlab
end
def
member_hash
(
member
)
parsed_hash
(
member
).
merge
(
'source_id'
=>
@project
.
id
,
'importing'
=>
true
)
parsed_hash
(
member
).
merge
(
'source_id'
=>
@project
.
id
,
'importing'
=>
true
,
'access_level'
=>
[
member
[
'access_level'
],
ProjectMember
::
MAINTAINER
].
min
)
end
def
parsed_hash
(
member
)
...
...
spec/lib/gitlab/import_export/members_mapper_spec.rb
浏览文件 @
30d91511
...
...
@@ -73,6 +73,13 @@ describe Gitlab::ImportExport::MembersMapper do
expect
(
user2
.
authorized_project?
(
project
)).
to
be
true
end
it
'maps an owner as a maintainer'
do
exported_members
.
first
[
'access_level'
]
=
ProjectMember
::
OWNER
expect
(
members_mapper
.
map
[
exported_user_id
]).
to
eq
(
user2
.
id
)
expect
(
ProjectMember
.
find_by_user_id
(
user2
.
id
).
access_level
).
to
eq
(
ProjectMember
::
MAINTAINER
)
end
context
'user is not an admin'
do
let
(
:user
)
{
create
(
:user
)
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录