Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
9c0f2485
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,发现更多精彩内容 >>
提交
9c0f2485
编写于
5月 05, 2017
作者:
V
Valery Sizov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Multiple issue assignee: resolve conflicts after merging upstream
上级
40f51c8e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
14 addition
and
20 deletion
+14
-20
app/services/slash_commands/interpret_service.rb
app/services/slash_commands/interpret_service.rb
+13
-19
spec/services/slash_commands/interpret_service_spec.rb
spec/services/slash_commands/interpret_service_spec.rb
+1
-1
未找到文件。
app/services/slash_commands/interpret_service.rb
浏览文件 @
9c0f2485
...
...
@@ -91,41 +91,35 @@ module SlashCommands
end
desc
'Assign'
explanation
do
|
user
|
"Assigns
#{
user
.
to_reference
}
."
if
user
explanation
do
|
user
s
|
"Assigns
#{
user
s
.
map
(
&
:to_reference
).
to_sentence
}
."
if
users
.
any?
end
params
'@user'
condition
do
current_user
.
can?
(
:"admin_
#{
issuable
.
to_ability_name
}
"
,
project
)
end
<<<<<<<
HEAD
command
:assign
do
|
assignee_param
|
user_ids
=
extract_references
(
assignee_param
,
:user
).
map
(
&
:id
)
parse_params
do
|
assignee_param
|
users
=
extract_references
(
assignee_param
,
:user
)
if
user
_id
s
.
empty?
user
_ids
=
User
.
where
(
username:
assignee_param
.
split
(
' '
).
map
(
&
:strip
)).
pluck
(
:id
)
if
users
.
empty?
user
s
=
User
.
where
(
username:
assignee_param
.
split
(
' '
).
map
(
&
:strip
)
)
end
next
if
user_ids
.
empty?
users
end
command
:assign
do
|
users
|
next
if
users
.
empty?
if
issuable
.
is_a?
(
Issue
)
@updates
[
:assignee_ids
]
=
user
_ids
@updates
[
:assignee_ids
]
=
user
s
.
map
(
&
:id
)
else
@updates
[
:assignee_id
]
=
user
_ids
.
last
@updates
[
:assignee_id
]
=
user
s
.
last
.
id
end
=======
parse_params
do
|
assignee_param
|
extract_references
(
assignee_param
,
:user
).
first
||
User
.
find_by
(
username:
assignee_param
)
end
command
:assign
do
|
user
|
@updates
[
:assignee_id
]
=
user
.
id
if
user
>>>>>>>
10
c1bf2d77fd0ab21309d0b136cbc0ac11f56c77
end
desc
'Remove assignee'
explanation
do
"Removes assignee
#{
issuable
.
assignee
.
to_reference
}
."
"Removes assignee
#{
issuable
.
assignee
s
.
first
.
to_reference
}
."
end
condition
do
issuable
.
persisted?
&&
...
...
spec/services/slash_commands/interpret_service_spec.rb
浏览文件 @
9c0f2485
...
...
@@ -874,7 +874,7 @@ describe SlashCommands::InterpretService, services: true do
describe
'unassign command'
do
let
(
:content
)
{
'/unassign'
}
let
(
:issue
)
{
create
(
:issue
,
project:
project
,
assignee
:
developer
)
}
let
(
:issue
)
{
create
(
:issue
,
project:
project
,
assignee
s:
[
developer
]
)
}
it
'includes current assignee reference'
do
_
,
explanations
=
service
.
explain
(
content
,
issue
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录