summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2018-06-28 12:22:01 +0000
committerFatih Acet <acetfatih@gmail.com>2018-06-28 12:22:01 +0000
commit3a6f2739f472d74f88ab43f1a9856bf760be5250 (patch)
tree55f4c94b20c82451a4613d0658c2fd056c4c1f80 /app
parentdb2f5786e859347d6c4c5ed1673b7271a3dd988d (diff)
parentc4826c33cd00ba489fda60a7f7c6b42899064202 (diff)
downloadgitlab-ce-3a6f2739f472d74f88ab43f1a9856bf760be5250.tar.gz
Merge branch '48568-tooltips-flicker-when-highlighting-award-emoji' into 'master'
Resolve "Tooltips flicker when highlighting award emoji" Closes #48568 See merge request gitlab-org/gitlab-ce!20235
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/notes/components/note_awards_list.vue2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/notes/components/note_awards_list.vue b/app/assets/javascripts/notes/components/note_awards_list.vue
index 521b4d16286..225d9f18612 100644
--- a/app/assets/javascripts/notes/components/note_awards_list.vue
+++ b/app/assets/javascripts/notes/components/note_awards_list.vue
@@ -200,6 +200,7 @@ export default {
:class="getAwardClassBindings(awardList, awardName)"
:title="awardTitle(awardList)"
class="btn award-control"
+ data-boundary="viewport"
data-placement="bottom"
type="button"
@click="handleAward(awardName)">
@@ -217,6 +218,7 @@ export default {
class="award-control btn js-add-award"
title="Add reaction"
aria-label="Add reaction"
+ data-boundary="viewport"
data-placement="bottom"
type="button">
<span