Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
a278b36a
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,发现更多精彩内容 >>
提交
a278b36a
编写于
4月 22, 2016
作者:
R
Rémy Coutable
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix an issue when filtering merge requests with more than one label
Signed-off-by:
N
Rémy Coutable
<
remy@rymai.me
>
上级
0cc8cee6
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
140 addition
and
2 deletion
+140
-2
CHANGELOG
CHANGELOG
+1
-0
app/models/concerns/issuable.rb
app/models/concerns/issuable.rb
+2
-2
spec/features/merge_requests/user_lists_merge_requests_spec.rb
...features/merge_requests/user_lists_merge_requests_spec.rb
+137
-0
未找到文件。
CHANGELOG
浏览文件 @
a278b36a
...
...
@@ -43,6 +43,7 @@ v 8.8.0 (unreleased)
v 8.7.4
- Fix always showing build notification message when switching between merge requests
- Links for Redmine issue references are generated correctly again (Benedikt Huss)
- Fix an issue when filtering merge requests with more than one label. !3886
v 8.7.3
- Emails, Gitlab::Email::Message, Gitlab::Diff, and Premailer::Adapter::Nokogiri are now instrumented
...
...
app/models/concerns/issuable.rb
浏览文件 @
a278b36a
...
...
@@ -124,8 +124,8 @@ module Issuable
end
def
with_label
(
title
)
if
title
.
is_a?
(
Array
)
&&
title
.
count
>
1
joins
(
:labels
).
where
(
labels:
{
title:
title
}).
group
(
'issues.id'
).
having
(
"count(distinct labels.title) =
#{
title
.
count
}
"
)
if
title
.
is_a?
(
Array
)
&&
title
.
size
>
1
joins
(
:labels
).
where
(
labels:
{
title:
title
}).
group
(
arel_table
[
:id
]).
having
(
"COUNT(DISTINCT labels.title) =
#{
title
.
size
}
"
)
else
joins
(
:labels
).
where
(
labels:
{
title:
title
})
end
...
...
spec/features/merge_requests/user_lists_merge_requests_spec.rb
0 → 100644
浏览文件 @
a278b36a
require
'spec_helper'
describe
'Projects > Merge requests > User lists merge requests'
,
feature:
true
do
include
SortingHelper
let
(
:project
)
{
create
(
:project
,
:public
)
}
let
(
:user
)
{
create
(
:user
)
}
before
do
@fix
=
create
(
:merge_request
,
title:
'fix'
,
source_project:
project
,
source_branch:
'fix'
,
assignee:
user
,
milestone:
create
(
:milestone
,
due_date:
'2013-12-11'
),
created_at:
1
.
minute
.
ago
,
updated_at:
1
.
minute
.
ago
)
create
(
:merge_request
,
title:
'markdown'
,
source_project:
project
,
source_branch:
'markdown'
,
assignee:
user
,
milestone:
create
(
:milestone
,
due_date:
'2013-12-12'
),
created_at:
2
.
minutes
.
ago
,
updated_at:
2
.
minutes
.
ago
)
create
(
:merge_request
,
title:
'lfs'
,
source_project:
project
,
source_branch:
'lfs'
,
created_at:
3
.
minutes
.
ago
,
updated_at:
10
.
seconds
.
ago
)
end
it
'filters on no assignee'
do
visit_merge_requests
(
project
,
assignee_id:
IssuableFinder
::
NONE
)
expect
(
current_path
).
to
eq
(
namespace_project_merge_requests_path
(
project
.
namespace
,
project
))
expect
(
page
).
to
have_content
'lfs'
expect
(
page
).
not_to
have_content
'fix'
expect
(
page
).
not_to
have_content
'markdown'
end
it
'filters on a specific assignee'
do
visit_merge_requests
(
project
,
assignee_id:
user
.
id
)
expect
(
page
).
not_to
have_content
'lfs'
expect
(
page
).
to
have_content
'fix'
expect
(
page
).
to
have_content
'markdown'
end
it
'sorts by newest'
do
visit_merge_requests
(
project
,
sort:
sort_value_recently_created
)
expect
(
first_merge_request
).
to
include
(
'lfs'
)
expect
(
last_merge_request
).
to
include
(
'fix'
)
end
it
'sorts by oldest'
do
visit_merge_requests
(
project
,
sort:
sort_value_oldest_created
)
expect
(
first_merge_request
).
to
include
(
'fix'
)
expect
(
last_merge_request
).
to
include
(
'lfs'
)
end
it
'sorts by last updated'
do
visit_merge_requests
(
project
,
sort:
sort_value_recently_updated
)
expect
(
first_merge_request
).
to
include
(
'lfs'
)
end
it
'sorts by oldest updated'
do
visit_merge_requests
(
project
,
sort:
sort_value_oldest_updated
)
expect
(
first_merge_request
).
to
include
(
'markdown'
)
end
it
'sorts by milestone due soon'
do
visit_merge_requests
(
project
,
sort:
sort_value_milestone_soon
)
expect
(
first_merge_request
).
to
include
(
'fix'
)
end
it
'sorts by milestone due later'
do
visit_merge_requests
(
project
,
sort:
sort_value_milestone_later
)
expect
(
first_merge_request
).
to
include
(
'markdown'
)
end
it
'filters on one label and sorts by due soon'
do
label
=
create
(
:label
,
project:
project
)
create
(
:label_link
,
label:
label
,
target:
@fix
)
visit_merge_requests
(
project
,
label_name:
[
label
.
name
],
sort:
sort_value_due_date_soon
)
expect
(
first_merge_request
).
to
include
(
'fix'
)
end
context
'while filtering on two labels'
do
let
(
:label
)
{
create
(
:label
,
project:
project
)
}
let
(
:label2
)
{
create
(
:label
,
project:
project
)
}
before
do
create
(
:label_link
,
label:
label
,
target:
@fix
)
create
(
:label_link
,
label:
label2
,
target:
@fix
)
end
it
'sorts by due soon'
do
visit_merge_requests
(
project
,
label_name:
[
label
.
name
,
label2
.
name
],
sort:
sort_value_due_date_soon
)
expect
(
first_merge_request
).
to
include
(
'fix'
)
end
context
'filter on assignee and'
do
it
'sorts by due soon'
do
visit_merge_requests
(
project
,
label_name:
[
label
.
name
,
label2
.
name
],
assignee_id:
user
.
id
,
sort:
sort_value_due_date_soon
)
expect
(
first_merge_request
).
to
include
(
'fix'
)
end
end
end
def
visit_merge_requests
(
project
,
opts
=
{})
visit
namespace_project_merge_requests_path
(
project
.
namespace
,
project
,
opts
)
end
def
first_merge_request
page
.
all
(
'ul.mr-list > li'
).
first
.
text
end
def
last_merge_request
page
.
all
(
'ul.mr-list > li'
).
last
.
text
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录