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
7099211e
Commit
7099211e
authored
May 31, 2019
by
Fatih Acet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix emoji picker visibility issue
parent
1523d078
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
0 deletions
+7
-0
app/assets/javascripts/notes/components/note_actions.vue
app/assets/javascripts/notes/components/note_actions.vue
+1
-0
changelogs/unreleased/60987-emoji-picker-popup.yml
changelogs/unreleased/60987-emoji-picker-popup.yml
+5
-0
spec/javascripts/notes/components/note_actions_spec.js
spec/javascripts/notes/components/note_actions_spec.js
+1
-0
No files found.
app/assets/javascripts/notes/components/note_actions.vue
View file @
7099211e
...
@@ -147,6 +147,7 @@ export default {
...
@@ -147,6 +147,7 @@ export default {
class=
"note-action-button note-emoji-button js-add-award js-note-emoji"
class=
"note-action-button note-emoji-button js-add-award js-note-emoji"
href=
"#"
href=
"#"
title=
"Add reaction"
title=
"Add reaction"
data-position=
"right"
>
>
<icon
css-classes=
"link-highlight award-control-icon-neutral"
name=
"slight-smile"
/>
<icon
css-classes=
"link-highlight award-control-icon-neutral"
name=
"slight-smile"
/>
<icon
css-classes=
"link-highlight award-control-icon-positive"
name=
"smiley"
/>
<icon
css-classes=
"link-highlight award-control-icon-positive"
name=
"smiley"
/>
...
...
changelogs/unreleased/60987-emoji-picker-popup.yml
0 → 100644
View file @
7099211e
---
title
:
Fix emoji picker visibility issue
merge_request
:
28984
author
:
type
:
fixed
spec/javascripts/notes/components/note_actions_spec.js
View file @
7099211e
...
@@ -58,6 +58,7 @@ describe('noteActions', () => {
...
@@ -58,6 +58,7 @@ describe('noteActions', () => {
it
(
'
should render emoji link
'
,
()
=>
{
it
(
'
should render emoji link
'
,
()
=>
{
expect
(
wrapper
.
find
(
'
.js-add-award
'
).
exists
()).
toBe
(
true
);
expect
(
wrapper
.
find
(
'
.js-add-award
'
).
exists
()).
toBe
(
true
);
expect
(
wrapper
.
find
(
'
.js-add-award
'
).
attributes
(
'
data-position
'
)).
toBe
(
'
right
'
);
});
});
describe
(
'
actions dropdown
'
,
()
=>
{
describe
(
'
actions dropdown
'
,
()
=>
{
...
...
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