Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
818665fb
Commit
818665fb
authored
Jun 04, 2020
by
GitLab Bot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add latest changes from gitlab-org/gitlab@12-10-stable-ee
parent
01fa8e53
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
10 deletions
+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
No files found.
app/assets/javascripts/issue.js
View file @
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
View file @
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
View file @
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
View file @
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
View file @
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"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment