From aaf59610548d9b0fd01acfd50e831cbe519ecba2 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 18 Mar 2020 15:09:45 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 app/assets/javascripts/vue_shared/components/changed_file_icon.vue  | 2 +-
 .../vue_shared/components/content_viewer/content_viewer.vue         | 1 +
 .../vue_shared/components/content_viewer/viewers/image_viewer.vue   | 1 +
 app/assets/javascripts/vue_shared/components/markdown/header.vue    | 6 +++---
 app/assets/javascripts/vue_shared/components/markdown/toolbar.vue   | 2 +-
 .../javascripts/vue_shared/components/project_avatar/default.vue    | 1 +
 app/assets/javascripts/vue_shared/components/select2_select.vue     | 2 +-
 .../vue_shared/components/sidebar/labels_select/base.vue            | 4 ++--
 .../vue_shared/components/sidebar/labels_select/dropdown_button.vue | 4 ++--
 .../components/sidebar/labels_select_vue/store/actions.js           | 2 +-
 app/assets/javascripts/vue_shared/components/smart_virtual_list.vue | 6 +++---
 .../javascripts/vue_shared/components/stacked_progress_bar.vue      | 2 +-
 12 files changed, 18 insertions(+), 15 deletions(-)

(limited to 'app/assets/javascripts/vue_shared/components')

diff --git a/app/assets/javascripts/vue_shared/components/changed_file_icon.vue b/app/assets/javascripts/vue_shared/components/changed_file_icon.vue
index 1bd320d81e8..60e41a16854 100644
--- a/app/assets/javascripts/vue_shared/components/changed_file_icon.vue
+++ b/app/assets/javascripts/vue_shared/components/changed_file_icon.vue
@@ -40,7 +40,7 @@ export default {
   computed: {
     changedIcon() {
       // False positive i18n lint: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/26
-      // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+      // eslint-disable-next-line @gitlab/require-i18n-strings
       const suffix = this.file.staged && this.showStagedIcon ? '-solid' : '';
 
       return `${getCommitIconMap(this.file).icon}${suffix}`;
diff --git a/app/assets/javascripts/vue_shared/components/content_viewer/content_viewer.vue b/app/assets/javascripts/vue_shared/components/content_viewer/content_viewer.vue
index 66155ddcdd9..2f5e5f35064 100644
--- a/app/assets/javascripts/vue_shared/components/content_viewer/content_viewer.vue
+++ b/app/assets/javascripts/vue_shared/components/content_viewer/content_viewer.vue
@@ -8,6 +8,7 @@ export default {
     content: {
       type: String,
       default: '',
+      required: false,
     },
     path: {
       type: String,
diff --git a/app/assets/javascripts/vue_shared/components/content_viewer/viewers/image_viewer.vue b/app/assets/javascripts/vue_shared/components/content_viewer/viewers/image_viewer.vue
index 6a4a834337a..9f98943f6b4 100644
--- a/app/assets/javascripts/vue_shared/components/content_viewer/viewers/image_viewer.vue
+++ b/app/assets/javascripts/vue_shared/components/content_viewer/viewers/image_viewer.vue
@@ -16,6 +16,7 @@ export default {
     renderInfo: {
       type: Boolean,
       default: true,
+      required: false,
     },
     innerCssClasses: {
       type: [Array, Object, String],
diff --git a/app/assets/javascripts/vue_shared/components/markdown/header.vue b/app/assets/javascripts/vue_shared/components/markdown/header.vue
index 36cbb230d30..bf25ed96f35 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/header.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/header.vue
@@ -39,10 +39,10 @@ export default {
     mdTable() {
       return [
         // False positive i18n lint: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/26
-        '| header | header |', // eslint-disable-line @gitlab/i18n/no-non-i18n-strings
+        '| header | header |', // eslint-disable-line @gitlab/require-i18n-strings
         '| ------ | ------ |',
-        '| cell | cell |', // eslint-disable-line @gitlab/i18n/no-non-i18n-strings
-        '| cell | cell |', // eslint-disable-line @gitlab/i18n/no-non-i18n-strings
+        '| cell | cell |', // eslint-disable-line @gitlab/require-i18n-strings
+        '| cell | cell |', // eslint-disable-line @gitlab/require-i18n-strings
       ].join('\n');
     },
     mdSuggestion() {
diff --git a/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue b/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
index 4da99e00165..486d4f6b609 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
@@ -1,5 +1,5 @@
 <script>
-/* eslint-disable @gitlab/vue-i18n/no-bare-strings */
+/* eslint-disable @gitlab/vue-require-i18n-strings */
 import { GlLink, GlLoadingIcon } from '@gitlab/ui';
 
 export default {
diff --git a/app/assets/javascripts/vue_shared/components/project_avatar/default.vue b/app/assets/javascripts/vue_shared/components/project_avatar/default.vue
index 881b5059d2a..4bc70870767 100644
--- a/app/assets/javascripts/vue_shared/components/project_avatar/default.vue
+++ b/app/assets/javascripts/vue_shared/components/project_avatar/default.vue
@@ -15,6 +15,7 @@ export default {
     size: {
       type: Number,
       default: 40,
+      required: false,
     },
   },
   computed: {
diff --git a/app/assets/javascripts/vue_shared/components/select2_select.vue b/app/assets/javascripts/vue_shared/components/select2_select.vue
index eb741d238b5..c90bd4da6c2 100644
--- a/app/assets/javascripts/vue_shared/components/select2_select.vue
+++ b/app/assets/javascripts/vue_shared/components/select2_select.vue
@@ -4,7 +4,7 @@ import 'select2';
 
 export default {
   // False positive i18n lint: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/26
-  // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+  // eslint-disable-next-line @gitlab/require-i18n-strings
   name: 'Select2Select',
   props: {
     options: {
diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/base.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/base.vue
index 0e401a9f7aa..44cc11a6aaa 100644
--- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/base.vue
+++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/base.vue
@@ -77,12 +77,12 @@ export default {
     },
     enableScopedLabels: {
       type: Boolean,
-      require: false,
+      required: false,
       default: false,
     },
     scopedLabelsDocumentationLink: {
       type: String,
-      require: false,
+      required: false,
       default: '#',
     },
   },
diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_button.vue b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_button.vue
index 1eed8907bb7..c3bc61d0053 100644
--- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_button.vue
+++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select/dropdown_button.vue
@@ -33,12 +33,12 @@ export default {
     },
     enableScopedLabels: {
       type: Boolean,
-      require: false,
+      required: false,
       default: false,
     },
     scopedLabelsDocumentationLink: {
       type: String,
-      require: false,
+      required: false,
       default: '#',
     },
   },
diff --git a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/store/actions.js b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/store/actions.js
index 145ec7dc566..e6053628eca 100644
--- a/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/store/actions.js
+++ b/app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/store/actions.js
@@ -45,7 +45,7 @@ export const createLabel = ({ state, dispatch }, label) => {
         dispatch('receiveCreateLabelSuccess');
         dispatch('toggleDropdownContentsCreateView');
       } else {
-        // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+        // eslint-disable-next-line @gitlab/require-i18n-strings
         throw new Error('Error Creating Label');
       }
     })
diff --git a/app/assets/javascripts/vue_shared/components/smart_virtual_list.vue b/app/assets/javascripts/vue_shared/components/smart_virtual_list.vue
index 49f987bb619..0fb7fd6cd38 100644
--- a/app/assets/javascripts/vue_shared/components/smart_virtual_list.vue
+++ b/app/assets/javascripts/vue_shared/components/smart_virtual_list.vue
@@ -8,9 +8,9 @@ export default {
     size: { type: Number, required: true },
     length: { type: Number, required: true },
     remain: { type: Number, required: true },
-    rtag: { type: String, default: 'div' },
-    wtag: { type: String, default: 'div' },
-    wclass: { type: String, default: null },
+    rtag: { type: String, default: 'div', required: false },
+    wtag: { type: String, default: 'div', required: false },
+    wclass: { type: String, default: null, required: false },
   },
 };
 </script>
diff --git a/app/assets/javascripts/vue_shared/components/stacked_progress_bar.vue b/app/assets/javascripts/vue_shared/components/stacked_progress_bar.vue
index ea564d1b2f2..ec077197c9c 100644
--- a/app/assets/javascripts/vue_shared/components/stacked_progress_bar.vue
+++ b/app/assets/javascripts/vue_shared/components/stacked_progress_bar.vue
@@ -83,7 +83,7 @@ export default {
     },
     barStyle(percent) {
       // False positive i18n lint: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/26
-      // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+      // eslint-disable-next-line @gitlab/require-i18n-strings
       return `width: ${percent}%;`;
     },
     getTooltip(label, count) {
-- 
cgit v1.2.1