Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
818665fb
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 搜索 >>
提交
818665fb
编写于
6月 04, 2020
作者:
G
GitLab Bot
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add latest changes from gitlab-org/gitlab@12-10-stable-ee
上级
01fa8e53
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
13 addition
and
10 deletion
+13
-10
app/assets/javascripts/issue.js
app/assets/javascripts/issue.js
+4
-6
app/views/projects/issues/show.html.haml
app/views/projects/issues/show.html.haml
+1
-1
app/views/shared/issuable/_close_reopen_report_toggle.html.haml
...ews/shared/issuable/_close_reopen_report_toggle.html.haml
+1
-1
changelogs/unreleased/219323-no-event-fired-at-clicking-close-issue-button-in-issue-page.yml
...nt-fired-at-clicking-close-issue-button-in-issue-page.yml
+5
-0
spec/frontend/fixtures/static/issue_with_mermaid_graph.html
spec/frontend/fixtures/static/issue_with_mermaid_graph.html
+2
-2
未找到文件。
app/assets/javascripts/issue.js
浏览文件 @
818665fb
...
...
@@ -87,9 +87,10 @@ export default class Issue {
initIssueBtnEventListeners
()
{
const
issueFailMessage
=
__
(
'
Unable to update this issue at this time.
'
);
return
$
(
document
).
on
(
// NOTE: data attribute seems unnecessary but is actually necessary
return
$
(
'
.js-issuable-buttons[data-action="close-reopen"]
'
).
on
(
'
click
'
,
'
.js-issuable-actions a.btn-close, .js-issuable-actions
a.btn-reopen
'
,
'
a.btn-close,
a.btn-reopen
'
,
e
=>
{
e
.
preventDefault
();
e
.
stopImmediatePropagation
();
...
...
@@ -101,10 +102,7 @@ export default class Issue {
this
.
disableCloseReopenButton
(
$button
);
const
url
=
$button
.
data
(
'
close-reopen-url
'
);
if
(
!
url
)
{
return
;
}
const
url
=
$button
.
attr
(
'
href
'
);
return
axios
.
put
(
url
)
...
...
app/views/projects/issues/show.html.haml
浏览文件 @
818665fb
...
...
@@ -30,7 +30,7 @@
%a
.btn.btn-default.float-right.d-block.d-sm-none.gutter-toggle.issuable-gutter-toggle.js-sidebar-toggle
{
href:
"#"
}
=
icon
(
'angle-double-left'
)
.detail-page-header-actions.js-issuable-actions
.detail-page-header-actions.js-issuable-actions
.js-issuable-buttons
{
data:
{
"action"
:
"close-reopen"
}
}
.clearfix.issue-btn-group.dropdown
%button
.btn.btn-default.float-left.d-md-none.d-lg-none.d-xl-none
{
type:
"button"
,
data:
{
toggle:
"dropdown"
}
}
Options
...
...
app/views/shared/issuable/_close_reopen_report_toggle.html.haml
浏览文件 @
818665fb
...
...
@@ -8,7 +8,7 @@
.float-left.btn-group.prepend-left-10.issuable-close-dropdown.droplab-dropdown.js-issuable-close-dropdown
=
link_to
"
#{
display_button_action
}
#{
display_issuable_type
}
"
,
close_reopen_issuable_path
(
issuable
),
method:
button_method
,
class:
"
#{
button_class
}
btn-
#{
button_action
}
"
,
title:
"
#{
display_button_action
}
#{
display_issuable_type
}
"
,
data:
{
'close-reopen-url'
:
close_reopen_issuable_path
(
issuable
)
}
method:
button_method
,
class:
"
#{
button_class
}
btn-
#{
button_action
}
"
,
title:
"
#{
display_button_action
}
#{
display_issuable_type
}
"
=
button_tag
type:
'button'
,
class:
"
#{
toggle_class
}
btn-
#{
button_action
}
-color"
,
data:
{
'dropdown-trigger'
=>
'#issuable-close-menu'
},
'aria-label'
=>
'Toggle dropdown'
do
...
...
changelogs/unreleased/219323-no-event-fired-at-clicking-close-issue-button-in-issue-page.yml
0 → 100644
浏览文件 @
818665fb
---
title
:
Fix close issue when user created the issue
merge_request
:
33440
author
:
type
:
fixed
spec/frontend/fixtures/static/issue_with_mermaid_graph.html
浏览文件 @
818665fb
...
...
@@ -15,14 +15,14 @@
<g
class=
"edgeLabels"
></g>
<g
class=
"nodes"
>
<g
class=
"node js-issuable-
acti
ons btn-close clickable"
class=
"node js-issuable-
butt
ons btn-close clickable"
style=
"opacity: 1;"
id=
"A"
transform=
"translate(92.67500305175781,25.25)"
title=
"click to PUT"
>
<a
class=
"js-issuable-
acti
ons btn-close clickable"
class=
"js-issuable-
butt
ons btn-close clickable"
href=
"https://invalid"
rel=
"noopener"
>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录