Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
56311d2b
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 搜索 >>
未验证
提交
56311d2b
编写于
9月 08, 2016
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Refactor code for bulk update merge requests feature
Signed-off-by:
N
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
上级
7891aec0
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
34 addition
and
29 deletion
+34
-29
app/assets/stylesheets/pages/issuable.scss
app/assets/stylesheets/pages/issuable.scss
+1
-1
app/controllers/concerns/issuable_actions.rb
app/controllers/concerns/issuable_actions.rb
+2
-2
app/helpers/issuables_helper.rb
app/helpers/issuables_helper.rb
+0
-8
app/views/shared/issuable/_filter.html.haml
app/views/shared/issuable/_filter.html.haml
+1
-1
spec/features/merge_requests/update_merge_requests_spec.rb
spec/features/merge_requests/update_merge_requests_spec.rb
+30
-17
未找到文件。
app/assets/stylesheets/pages/issuable.scss
浏览文件 @
56311d2b
...
...
@@ -409,7 +409,7 @@
li
{
.issue-check
{
float
:
left
;
padding-right
:
16px
;
padding-right
:
$gl-padding
;
margin-bottom
:
10px
;
min-width
:
15px
;
...
...
app/controllers/concerns/issuable_actions.rb
浏览文件 @
56311d2b
...
...
@@ -24,13 +24,13 @@ module IssuableActions
private
def
authorize_destroy_issuable!
unless
c
urrent_user
.
can?
(
:"destroy_
#{
issuable
.
to_ability_name
}
"
,
issuable
)
unless
c
an?
(
current_user
,
:"destroy_
#{
issuable
.
to_ability_name
}
"
,
issuable
)
return
access_denied!
end
end
def
authorize_admin_issuable!
unless
c
urrent_user
.
can?
(
:"admin_
#{
resource_name
}
"
,
@project
)
unless
c
an?
(
current_user
,
:"admin_
#{
resource_name
}
"
,
@project
)
return
access_denied!
end
end
...
...
app/helpers/issuables_helper.rb
浏览文件 @
56311d2b
...
...
@@ -111,12 +111,4 @@ module IssuablesHelper
issuable
.
open?
?
:opened
:
:closed
end
end
def
issuable_bulk_update_path
(
type
)
if
type
==
:merge_requests
bulk_update_namespace_project_merge_requests_path
(
@project
.
namespace
,
@project
)
else
bulk_update_namespace_project_issues_path
(
@project
.
namespace
,
@project
)
end
end
end
app/views/shared/issuable/_filter.html.haml
浏览文件 @
56311d2b
...
...
@@ -49,7 +49,7 @@
-
if
@bulk_edit
.issues_bulk_update.hide
=
form_tag
issuable_bulk_update_path
(
type
)
,
method: :post
,
class:
'bulk-update'
do
=
form_tag
[
:bulk_update
,
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
type
]
,
method: :post
,
class:
'bulk-update'
do
.filter-item.inline
=
dropdown_tag
(
"Status"
,
options:
{
toggle_class:
"js-issue-status"
,
title:
"Change status"
,
dropdown_class:
"dropdown-menu-status dropdown-menu-selectable"
,
data:
{
field_name:
"update[state_event]"
}
}
)
do
%ul
...
...
spec/features/merge_requests/update_merge_requests_spec.rb
浏览文件 @
56311d2b
...
...
@@ -13,29 +13,39 @@ feature 'Multiple merge requests updating from merge_requests#index', feature: t
end
context
'status'
,
js:
true
do
it
'sets to closed'
do
visit
namespace_project_merge_requests_path
(
project
.
namespace
,
project
)
describe
'close merge request'
do
before
do
visit
namespace_project_merge_requests_path
(
project
.
namespace
,
project
)
end
change_status
(
'Closed'
)
expect
(
page
).
to
have_selector
(
'.merge-request'
,
count:
0
)
it
'closes merge request'
do
change_status
(
'Closed'
)
expect
(
page
).
to
have_selector
(
'.merge-request'
,
count:
0
)
end
end
it
'sets to open'
do
merge_request
.
close
visit
namespace_project_merge_requests_path
(
project
.
namespace
,
project
,
state:
'closed'
)
describe
'reopen merge request'
do
before
do
merge_request
.
close
visit
namespace_project_merge_requests_path
(
project
.
namespace
,
project
,
state:
'closed'
)
end
it
'reopens merge request'
do
change_status
(
'Open'
)
change_status
(
'Open'
)
e
xpect
(
page
).
to
have_selector
(
'.merge-request'
,
count:
0
)
expect
(
page
).
to
have_selector
(
'.merge-request'
,
count:
0
)
e
nd
end
end
context
'assignee'
,
js:
true
do
context
'set assignee'
do
describe
'set assignee'
do
before
do
visit
namespace_project_merge_requests_path
(
project
.
namespace
,
project
)
end
it
"
should update
merge request with assignee"
do
it
"
updates
merge request with assignee"
do
change_assignee
(
user
.
name
)
page
.
within
(
'.merge-request .controls'
)
do
...
...
@@ -44,15 +54,16 @@ feature 'Multiple merge requests updating from merge_requests#index', feature: t
end
end
context
'remove assignee'
do
describe
'remove assignee'
do
before
do
merge_request
.
assignee
=
user
merge_request
.
save
visit
namespace_project_merge_requests_path
(
project
.
namespace
,
project
)
end
it
"
should remove
assignee from the merge request"
do
it
"
removes
assignee from the merge request"
do
change_assignee
(
'Unassigned'
)
expect
(
find
(
'.merge-request .controls'
)).
not_to
have_css
(
'.author_link'
)
end
end
...
...
@@ -61,26 +72,28 @@ feature 'Multiple merge requests updating from merge_requests#index', feature: t
context
'milestone'
,
js:
true
do
let
(
:milestone
)
{
create
(
:milestone
,
project:
project
)
}
context
'set milestone'
do
describe
'set milestone'
do
before
do
visit
namespace_project_merge_requests_path
(
project
.
namespace
,
project
)
end
it
"
should update
merge request with milestone"
do
it
"
updates
merge request with milestone"
do
change_milestone
(
milestone
.
title
)
expect
(
find
(
'.merge-request'
)).
to
have_content
milestone
.
title
end
end
context
'unset milestone'
do
describe
'unset milestone'
do
before
do
merge_request
.
milestone
=
milestone
merge_request
.
save
visit
namespace_project_merge_requests_path
(
project
.
namespace
,
project
)
end
it
"
should remove
milestone from the merge request"
do
it
"
removes
milestone from the merge request"
do
change_milestone
(
"No Milestone"
)
expect
(
find
(
'.merge-request'
)).
not_to
have_content
milestone
.
title
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录