Add latest changes from gitlab-org/gitlab@master

app/assets/javascripts/lib/utils/datetime_range.js

@@ -10,7 +10,7 @@ const durationToMillis = duration => {
   if (Object.entries(duration).length === 1 && Number.isFinite(duration.seconds)) {
     return secondsToMilliseconds(duration.seconds);
   }
-  // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+  // eslint-disable-next-line @gitlab/require-i18n-strings
   throw new Error('Invalid duration: only `seconds` is supported');
 };
@@ -131,7 +131,7 @@ const convertOpenToFixed = ({ anchor, direction }) => {
  * Handles invalid date ranges
  */
 const handleInvalidRange = () => {
-  // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+  // eslint-disable-next-line @gitlab/require-i18n-strings
   throw new Error('The input range does not have the right format.');
 };

app/assets/javascripts/lib/utils/notify.js

@@ -13,7 +13,7 @@ function notificationGranted(message, opts, onclick) {
 }
 function notifyPermissions() {
-  /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
+  /* eslint-disable-next-line @gitlab/require-i18n-strings */
   if ('Notification' in window) {
     return Notification.requestPermission();
   }
@@ -25,7 +25,7 @@ function notifyMe(message, body, icon, onclick) {
     icon,
   };
   // Let's check if the browser supports notifications
-  /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
+  /* eslint-disable-next-line @gitlab/require-i18n-strings */
   if (!('Notification' in window)) {
     // do nothing
   } else if (Notification.permission === 'granted') {

app/assets/javascripts/lib/utils/unit_format/formatter_factory.js

@@ -111,7 +111,7 @@ export const scaledSIFormatter = (unit = '', prefixOffset = 0) => {
   });
   if (!units.length) {
-    // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+    // eslint-disable-next-line @gitlab/require-i18n-strings
     throw new RangeError('The unit cannot be converted, please try a different scale');
   }
@@ -122,7 +122,7 @@ export const scaledSIFormatter = (unit = '', prefixOffset = 0) => {
  * Returns a function that formats a number scaled using SI units notation.
  */
 export const scaledBinaryFormatter = (unit = '', prefixOffset = 0) => {
-  // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+  // eslint-disable-next-line @gitlab/require-i18n-strings
   const multiplicative = ['Ki', 'Mi', 'Gi', 'Ti', 'Pi', 'Ei', 'Zi', 'Yi'];
   const symbols = ['', ...multiplicative];
@@ -131,7 +131,7 @@ export const scaledBinaryFormatter = (unit = '', prefixOffset = 0) => {
   });
   if (!units.length) {
-    // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings
+    // eslint-disable-next-line @gitlab/require-i18n-strings
     throw new RangeError('The unit cannot be converted, please try a different scale');
   }

app/assets/javascripts/main.js

@@ -49,7 +49,7 @@ window.$ = jQuery;
 // Add nonce to jQuery script handler
 jQuery.ajaxSetup({
   converters: {
-    // eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings, func-names
+    // eslint-disable-next-line @gitlab/require-i18n-strings, func-names
     'text script': function(text) {
       jQuery.globalEval(text, { nonce: getCspNonceValue() });
       return text;

app/assets/javascripts/monitoring/components/charts/stacked_column.vue

@@ -68,7 +68,7 @@ export default {
           }
         })
         .catch(e => {
-          // eslint-disable-next-line no-console, @gitlab/i18n/no-non-i18n-strings
+          // eslint-disable-next-line no-console, @gitlab/require-i18n-strings
           console.error('SVG could not be rendered correctly: ', e);
         });
     },

app/assets/javascripts/monitoring/components/charts/time_series.vue

@@ -327,7 +327,7 @@ export default {
           }
         })
         .catch(e => {
-          // eslint-disable-next-line no-console, @gitlab/i18n/no-non-i18n-strings
+          // eslint-disable-next-line no-console, @gitlab/require-i18n-strings
           console.error('SVG could not be rendered correctly: ', e);
         });
     },

app/assets/javascripts/monitoring/components/panel_type.vue

@@ -95,7 +95,7 @@ export default {
     csvText() {
       const chartData = this.graphData.metrics[0].result[0].values;
       const yLabel = this.graphData.y_label;
-      const header = `timestamp,${yLabel}\r\n`; // eslint-disable-line @gitlab/i18n/no-non-i18n-strings
+      const header = `timestamp,${yLabel}\r\n`; // eslint-disable-line @gitlab/require-i18n-strings
       return chartData.reduce((csv, data) => {
         const row = data.join(',');
         return `${csv}${row}\r\n`;

app/assets/javascripts/monitoring/utils.js

@@ -28,7 +28,7 @@ export const graphDataValidatorForValues = (isValues, graphData) => {
   );
 };
-/* eslint-disable @gitlab/i18n/no-non-i18n-strings */
+/* eslint-disable @gitlab/require-i18n-strings */
 /**
  * Checks that element that triggered event is located on cluster health check dashboard
  * @param {HTMLElement}  element to check against

app/assets/javascripts/mr_popover/components/mr_popover.vue

 <script>
-/* eslint-disable @gitlab/vue-i18n/no-bare-strings */
+/* eslint-disable @gitlab/vue-require-i18n-strings */
 import { GlPopover, GlSkeletonLoading } from '@gitlab/ui';
 import CiIcon from '../../vue_shared/components/ci_icon.vue';
 import timeagoMixin from '../../vue_shared/mixins/timeago';
@@ -8,7 +8,7 @@ import { mrStates, humanMRStates } from '../constants';
 export default {
   // name: 'MRPopover' is a false positive: https://gitlab.com/gitlab-org/frontend/eslint-plugin-i18n/issues/25
-  name: 'MRPopover', // eslint-disable-line @gitlab/i18n/no-non-i18n-strings
+  name: 'MRPopover', // eslint-disable-line @gitlab/require-i18n-strings
   components: {
     GlPopover,
     GlSkeletonLoading,
@@ -102,11 +102,11 @@ export default {
         <ci-icon v-if="detailedStatus" :status="detailedStatus" />
       </div>
       <h5 class="my-2">{{ mergeRequestTitle }}</h5>
-      <!-- eslint-disable @gitlab/vue-i18n/no-bare-strings -->
+      <!-- eslint-disable @gitlab/vue-require-i18n-strings -->
       <div class="text-secondary">
         {{ `${projectPath}!${mergeRequestIID}` }}
       </div>
-      <!-- eslint-enable @gitlab/vue-i18n/no-bare-strings -->
+      <!-- eslint-enable @gitlab/vue-require-i18n-strings -->
     </div>
   </gl-popover>
 </template>

app/assets/javascripts/new_branch_form.js

-/* eslint-disable func-names, consistent-return, no-return-assign, no-else-return, @gitlab/i18n/no-non-i18n-strings */
+/* eslint-disable func-names, consistent-return, no-return-assign, no-else-return, @gitlab/require-i18n-strings */
 import $ from 'jquery';
 import RefSelectDropdown from './ref_select_dropdown';

app/assets/javascripts/notebook/cells/code/index.vue

@@ -29,6 +29,7 @@ export default {
     metadata: {
       type: Object,
       default: () => ({}),
+      required: false,
     },
   },
   computed: {

app/assets/javascripts/notebook/cells/markdown.vue

@@ -43,7 +43,7 @@ renderer.paragraph = t => {
   if (typeof katex !== 'undefined') {
     const katexString = text
       .replace(/&/g, '&')
-      .replace(/&=&/g, '\\space=\\space') // eslint-disable-line @gitlab/i18n/no-non-i18n-strings
+      .replace(/&=&/g, '\\space=\\space') // eslint-disable-line @gitlab/require-i18n-strings
       .replace(/<(\/?)em>/g, '_');
     const regex = new RegExp(katexRegexString, 'gi');
     const matchLocation = katexString.search(regex);

app/assets/javascripts/notebook/cells/output/image.vue

@@ -25,7 +25,7 @@ export default {
   },
   computed: {
     imgSrc() {
-      return `data:${this.outputType};base64,${this.rawCode}`; // eslint-disable-line @gitlab/i18n/no-non-i18n-strings
+      return `data:${this.outputType};base64,${this.rawCode}`; // eslint-disable-line @gitlab/require-i18n-strings
     },
     showOutput() {
       return this.index === 0;

app/assets/javascripts/notebook/cells/output/index.vue

@@ -22,6 +22,7 @@ export default {
     metadata: {
       type: Object,
       default: () => ({}),
+      required: false,
     },
   },
   methods: {

app/assets/javascripts/notebook/index.vue

@@ -39,7 +39,7 @@ export default {
   },
   methods: {
     cellType(type) {
-      return `${type}-cell`; // eslint-disable-line @gitlab/i18n/no-non-i18n-strings
+      return `${type}-cell`; // eslint-disable-line @gitlab/require-i18n-strings
     },
   },
 };

app/assets/javascripts/notes/components/diff_with_note.vue

 <script>
-/* eslint-disable @gitlab/vue-i18n/no-bare-strings */
+/* eslint-disable @gitlab/vue-require-i18n-strings */
 import { mapState, mapActions } from 'vuex';
 import { GlSkeletonLoading } from '@gitlab/ui';
 import DiffFileHeader from '~/diffs/components/diff_file_header.vue';

app/assets/javascripts/notes/components/note_edited_text.vue

 <script>
-/* eslint-disable @gitlab/vue-i18n/no-bare-strings */
+/* eslint-disable @gitlab/vue-require-i18n-strings */
 import timeAgoTooltip from '../../vue_shared/components/time_ago_tooltip.vue';
 export default {

app/assets/javascripts/operation_settings/components/external_dashboard.vue

@@ -54,14 +54,14 @@ export default {
           :description="s__('ExternalMetrics|Enter the URL of the dashboard you want to link to')"
         >
           <!-- placeholder with a url is a false positive  -->
-          <!-- eslint-disable @gitlab/vue-i18n/no-bare-attribute-strings -->
+          <!-- eslint-disable @gitlab/vue-require-i18n-attribute-strings -->
           <gl-form-input
             id="full-dashboard-url"
             v-model="userDashboardUrl"
             placeholder="https://my-org.gitlab.io/my-dashboards"
             @keydown.enter.native.prevent="updateExternalDashboardUrl"
           />
-          <!-- eslint-enable @gitlab/vue-i18n/no-bare-attribute-strings -->
+          <!-- eslint-enable @gitlab/vue-require-i18n-attribute-strings -->
         </gl-form-group>
         <gl-button variant="success" @click="updateExternalDashboardUrl">
           {{ __('Save Changes') }}

app/assets/javascripts/pages/admin/users/index.js

@@ -19,7 +19,7 @@ function loadModalsConfigurationFromHtml(modalsElement) {
   const modalsConfiguration = {};
   if (!modalsElement) {
-    /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
+    /* eslint-disable-next-line @gitlab/require-i18n-strings */
     throw new Error('Modals content element not found!');
   }

app/assets/javascripts/performance_bar/index.js

-/* eslint-disable @gitlab/i18n/no-non-i18n-strings */
+/* eslint-disable @gitlab/require-i18n-strings */
 import Vue from 'vue';
 import axios from '~/lib/utils/axios_utils';