diff options
| author | Kushal Pandya <kushalspandya@gmail.com> | 2019-05-31 16:39:34 +0300 |
|---|---|---|
| committer | Kushal Pandya <kushalspandya@gmail.com> | 2019-05-31 16:39:34 +0300 |
| commit | 12aff0b73cacf533533d584d68307b1b6a030cee (patch) | |
| tree | 9a2a3f176296bd39ab801ecafeb6f90517cf1688 /app/assets/javascripts | |
| parent | 4e888212a1cdf5898c5cef69f5a2de909a275d31 (diff) | |
| parent | 7099211ea7eb409e7b13670a3ecaa8503f4714fc (diff) | |
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
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/notes/components/note_actions.vue | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/assets/javascripts/notes/components/note_actions.vue b/app/assets/javascripts/notes/components/note_actions.vue index 78f397ccc12..c9c40cb6acf 100644 --- a/app/assets/javascripts/notes/components/note_actions.vue +++ b/app/assets/javascripts/notes/components/note_actions.vue @@ -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" /> |