Add latest changes from gitlab-org/gitlab@master

2 files changed, 21 insertions, 0 deletions

diff --git a/app/assets/javascripts/vue_shared/components/listbox_input/init_listbox_inputs.js b/app/assets/javascripts/vue_shared/components/listbox_input/init_listbox_inputs.js
index ad89b78b521..b447822b1e0 100644
--- a/app/assets/javascripts/vue_shared/components/listbox_input/init_listbox_inputs.js
+++ b/app/assets/javascripts/vue_shared/components/listbox_input/init_listbox_inputs.js
@@ -1,5 +1,6 @@
 import Vue from 'vue';
 import ListboxInput from '~/vue_shared/components/listbox_input/listbox_input.vue';
+import { parseBoolean } from '~/lib/utils/common_utils';
 
 export const initListboxInputs = () => {
   const els = [...document.querySelectorAll('.js-listbox-input')];
@@ -30,6 +31,8 @@ export const initListboxInputs = () => {
             name,
             defaultToggleText,
             selected: this.selected,
+            block: parseBoolean(el.dataset.block),
+            fluidWidth: parseBoolean(el.dataset.fluidWidth),
             items,
           },
           attrs: {
diff --git a/app/assets/javascripts/vue_shared/components/listbox_input/listbox_input.vue b/app/assets/javascripts/vue_shared/components/listbox_input/listbox_input.vue
index 0f8ff5291a4..a59a7494472 100644
--- a/app/assets/javascripts/vue_shared/components/listbox_input/listbox_input.vue
+++ b/app/assets/javascripts/vue_shared/components/listbox_input/listbox_input.vue
@@ -47,6 +47,21 @@ export default {
       required: false,
       default: false,
     },
+    fluidWidth: {
+      type: GlCollapsibleListbox.props.fluidWidth.type,
+      required: false,
+      default: GlCollapsibleListbox.props.fluidWidth.default,
+    },
+    placement: {
+      type: GlCollapsibleListbox.props.placement.type,
+      required: false,
+      default: GlCollapsibleListbox.props.placement.default,
+    },
+    block: {
+      type: GlCollapsibleListbox.props.block.type,
+      required: false,
+      default: GlCollapsibleListbox.props.block.default,
+    },
   },
   data() {
     return {
@@ -123,6 +138,9 @@ export default {
       :searchable="isSearchable"
       :no-results-text="$options.i18n.noResultsText"
       :disabled="disabled"
+      :fluid-width="fluidWidth"
+      :placement="placement"
+      :block="block"
       @search="search"
       @select="$emit($options.model.event, $event)"
     />