Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 26 deletions

diff --git a/app/assets/javascripts/notifications/components/notification_email_listbox_input.vue b/app/assets/javascripts/notifications/components/notification_email_listbox_input.vue
index c58f4856d44..5d5524deb0d 100644
--- a/app/assets/javascripts/notifications/components/notification_email_listbox_input.vue
+++ b/app/assets/javascripts/notifications/components/notification_email_listbox_input.vue
@@ -5,31 +5,7 @@ export default {
   components: {
     ListboxInput,
   },
-  inject: {
-    label: {
-      from: 'label',
-      default: '',
-    },
-    name: {
-      from: 'name',
-    },
-    emails: {
-      from: 'emails',
-      default: () => [],
-    },
-    emptyValueText: {
-      from: 'emptyValueText',
-      required: true,
-    },
-    value: {
-      from: 'value',
-      default: '',
-    },
-    disabled: {
-      from: 'disabled',
-      default: false,
-    },
-  },
+  inject: ['label', 'name', 'emails', 'emptyValueText', 'value', 'disabled'],
   data() {
     return {
       selected: this.value,
diff --git a/app/assets/javascripts/notifications/index.js b/app/assets/javascripts/notifications/index.js
index 42271b44e7c..1395084f68c 100644
--- a/app/assets/javascripts/notifications/index.js
+++ b/app/assets/javascripts/notifications/index.js
@@ -10,7 +10,7 @@ const initNotificationEmailListboxInputs = () => {
   const els = [...document.querySelectorAll('.js-notification-email-listbox-input')];
 
   els.forEach((el, index) => {
-    const { label, name, emptyValueText, value } = el.dataset;
+    const { label, name, emptyValueText, value = '' } = el.dataset;
 
     return new Vue({
       el,