Add latest changes from gitlab-org/gitlab@master

1 files changed, 12 insertions, 2 deletions

diff --git a/app/assets/javascripts/emoji/components/picker.vue b/app/assets/javascripts/emoji/components/picker.vue
index dc3eac0cd0c..b3888114396 100644
--- a/app/assets/javascripts/emoji/components/picker.vue
+++ b/app/assets/javascripts/emoji/components/picker.vue
@@ -28,6 +28,16 @@ export default {
       required: false,
       default: () => [],
     },
+    right: {
+      type: Boolean,
+      required: false,
+      default: true,
+    },
+    boundary: {
+      type: String,
+      required: false,
+      default: '',
+    },
   },
   data() {
     return {
@@ -62,7 +72,7 @@ export default {
       addToFrequentlyUsed(name);
     },
     getBoundaryElement() {
-      return document.querySelector('.content-wrapper') || 'scrollParent';
+      return this.boundary || document.querySelector('.content-wrapper') || 'scrollParent';
     },
     onSearchInput() {
       this.$refs.virtualScoller.setScrollTop(0);
@@ -87,7 +97,7 @@ export default {
       menu-class="dropdown-extended-height"
       category="secondary"
       no-flip
-      right
+      :right="right"
       lazy
       @shown="$emit('shown')"
       @hidden="$emit('hidden')"