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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
41ff0d1e
Commit
41ff0d1e
authored
Apr 23, 2019
by
Sam Bigelow
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Init MR Popovers onmount of system note
Fixing a bug where system notes had no MR Popovers
parent
951ffd9d
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
0 deletions
+15
-0
app/assets/javascripts/vue_shared/components/notes/system_note.vue
...s/javascripts/vue_shared/components/notes/system_note.vue
+4
-0
changelogs/unreleased/60855-mr-popover-is-not-attached-in-system-notes.yml
...ased/60855-mr-popover-is-not-attached-in-system-notes.yml
+5
-0
spec/javascripts/vue_shared/components/notes/system_note_spec.js
...vascripts/vue_shared/components/notes/system_note_spec.js
+6
-0
No files found.
app/assets/javascripts/vue_shared/components/notes/system_note.vue
View file @
41ff0d1e
...
@@ -22,6 +22,7 @@ import noteHeader from '~/notes/components/note_header.vue';
...
@@ -22,6 +22,7 @@ import noteHeader from '~/notes/components/note_header.vue';
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
Icon
from
'
~/vue_shared/components/icon.vue
'
;
import
TimelineEntryItem
from
'
./timeline_entry_item.vue
'
;
import
TimelineEntryItem
from
'
./timeline_entry_item.vue
'
;
import
{
spriteIcon
}
from
'
../../../lib/utils/common_utils
'
;
import
{
spriteIcon
}
from
'
../../../lib/utils/common_utils
'
;
import
initMRPopovers
from
'
~/mr_popover/
'
;
const
MAX_VISIBLE_COMMIT_LIST_COUNT
=
3
;
const
MAX_VISIBLE_COMMIT_LIST_COUNT
=
3
;
...
@@ -71,6 +72,9 @@ export default {
...
@@ -71,6 +72,9 @@ export default {
);
);
},
},
},
},
mounted
()
{
initMRPopovers
(
this
.
$el
.
querySelectorAll
(
'
.gfm-merge_request
'
));
},
};
};
</
script
>
</
script
>
...
...
changelogs/unreleased/60855-mr-popover-is-not-attached-in-system-notes.yml
0 → 100644
View file @
41ff0d1e
---
title
:
Fix bug where system note MR has no popover
merge_request
:
27589
author
:
type
:
fixed
spec/javascripts/vue_shared/components/notes/system_note_spec.js
View file @
41ff0d1e
...
@@ -5,8 +5,10 @@ import createStore from '~/notes/stores';
...
@@ -5,8 +5,10 @@ import createStore from '~/notes/stores';
describe
(
'
system note component
'
,
()
=>
{
describe
(
'
system note component
'
,
()
=>
{
let
vm
;
let
vm
;
let
props
;
let
props
;
let
initMRPopoversSpy
;
beforeEach
(()
=>
{
beforeEach
(()
=>
{
initMRPopoversSpy
=
spyOnDependency
(
issueSystemNote
,
'
initMRPopovers
'
);
props
=
{
props
=
{
note
:
{
note
:
{
id
:
'
1424
'
,
id
:
'
1424
'
,
...
@@ -56,4 +58,8 @@ describe('system note component', () => {
...
@@ -56,4 +58,8 @@ describe('system note component', () => {
it
(
'
removes wrapping paragraph from note HTML
'
,
()
=>
{
it
(
'
removes wrapping paragraph from note HTML
'
,
()
=>
{
expect
(
vm
.
$el
.
querySelector
(
'
.system-note-message
'
).
innerHTML
).
toEqual
(
'
<span>closed</span>
'
);
expect
(
vm
.
$el
.
querySelector
(
'
.system-note-message
'
).
innerHTML
).
toEqual
(
'
<span>closed</span>
'
);
});
});
it
(
'
should initMRPopovers onMount
'
,
()
=>
{
expect
(
initMRPopoversSpy
).
toHaveBeenCalled
();
});
});
});
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