Merge branch '60987-emoji-picker-popup' into 'master'

Fix emoji picker popup is not always fully visible

Closes #60987

See merge request gitlab-org/gitlab-ce!28984
This commit is contained in:
Kushal Pandya 2019-05-31 13:39:34 +00:00
commit 12aff0b73c
3 changed files with 7 additions and 0 deletions

View File

@ -147,6 +147,7 @@ export default {
class="note-action-button note-emoji-button js-add-award js-note-emoji"
href="#"
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-positive" name="smiley" />

View File

@ -0,0 +1,5 @@
---
title: Fix emoji picker visibility issue
merge_request: 28984
author:
type: fixed

View File

@ -58,6 +58,7 @@ describe('noteActions', () => {
it('should render emoji link', () => {
expect(wrapper.find('.js-add-award').exists()).toBe(true);
expect(wrapper.find('.js-add-award').attributes('data-position')).toBe('right');
});
describe('actions dropdown', () => {