Add latest changes from gitlab-org/gitlab@master

3 files changed, 4 insertions, 4 deletions

diff --git a/app/assets/javascripts/repository/components/table/row.vue b/app/assets/javascripts/repository/components/table/row.vue
index f3e6e3686a3..88a7e3e3a68 100644
--- a/app/assets/javascripts/repository/components/table/row.vue
+++ b/app/assets/javascripts/repository/components/table/row.vue
@@ -151,7 +151,7 @@ export default {
       >
         {{ fullPath }}
       </component>
-      <!-- eslint-disable-next-line @gitlab/vue-i18n/no-bare-strings -->
+      <!-- eslint-disable-next-line @gitlab/vue-require-i18n-strings -->
       <gl-badge v-if="lfsOid" variant="default" class="label-lfs ml-1">LFS</gl-badge>
       <template v-if="isSubmodule">
         @ <gl-link :href="submoduleTreeUrl" class="commit-sha">{{ shortSha }}</gl-link>
diff --git a/app/assets/javascripts/repository/graphql.js b/app/assets/javascripts/repository/graphql.js
index 265df20636b..0c68b5a599b 100644
--- a/app/assets/javascripts/repository/graphql.js
+++ b/app/assets/javascripts/repository/graphql.js
@@ -39,7 +39,7 @@ const defaultClient = createDefaultClient(
     cacheConfig: {
       fragmentMatcher,
       dataIdFromObject: obj => {
-        /* eslint-disable @gitlab/i18n/no-non-i18n-strings */
+        /* eslint-disable @gitlab/require-i18n-strings */
         // eslint-disable-next-line no-underscore-dangle
         switch (obj.__typename) {
           // We need to create a dynamic ID for each entry
@@ -55,7 +55,7 @@ const defaultClient = createDefaultClient(
             // eslint-disable-next-line no-underscore-dangle
             return obj.id || obj._id;
         }
-        /* eslint-enable @gitlab/i18n/no-non-i18n-strings */
+        /* eslint-enable @gitlab/require-i18n-strings */
       },
     },
   },
diff --git a/app/assets/javascripts/repository/utils/title.js b/app/assets/javascripts/repository/utils/title.js
index 9c4b334a1ce..442f6c5d741 100644
--- a/app/assets/javascripts/repository/utils/title.js
+++ b/app/assets/javascripts/repository/utils/title.js
@@ -9,7 +9,7 @@ export const setTitle = (pathMatch, ref, project) => {
   const path = pathMatch.replace(/^\//, '');
   const isEmpty = path === '';
 
-  /* eslint-disable-next-line @gitlab/i18n/no-non-i18n-strings */
+  /* eslint-disable-next-line @gitlab/require-i18n-strings */
   document.title = `${isEmpty ? 'Files' : path} · ${ref} · ${project} ${DEFAULT_TITLE}`;
 };