Add latest changes from gitlab-org/gitlab@13-8-stable-eev13.8.0-rc42

12 files changed, 29 insertions, 23 deletions

diff --git a/app/assets/javascripts/repository/components/breadcrumbs.vue b/app/assets/javascripts/repository/components/breadcrumbs.vue
index a1f1c77df2f..c9862572b16 100644
--- a/app/assets/javascripts/repository/components/breadcrumbs.vue
+++ b/app/assets/javascripts/repository/components/breadcrumbs.vue
@@ -40,7 +40,7 @@ export default {
           projectPath: this.projectPath,
         };
       },
-      update: data => data.project?.userPermissions,
+      update: (data) => data.project?.userPermissions,
       error(error) {
         throw error;
       },
@@ -105,7 +105,7 @@ export default {
     pathLinks() {
       return this.currentPath
         .split('/')
-        .filter(p => p !== '')
+        .filter((p) => p !== '')
         .reduce(
           (acc, name, i) => {
             const path = joinPaths(i > 0 ? acc[i].path : '', escapeFileUrl(name));
diff --git a/app/assets/javascripts/repository/components/directory_download_links.vue b/app/assets/javascripts/repository/components/directory_download_links.vue
index dffadade082..8c029fc9973 100644
--- a/app/assets/javascripts/repository/components/directory_download_links.vue
+++ b/app/assets/javascripts/repository/components/directory_download_links.vue
@@ -18,7 +18,7 @@ export default {
   },
   computed: {
     normalizedLinks() {
-      return this.links.map(link => ({
+      return this.links.map((link) => ({
         text: link.text,
         path: `${link.path}?path=${this.currentPath}`,
       }));
diff --git a/app/assets/javascripts/repository/components/last_commit.vue b/app/assets/javascripts/repository/components/last_commit.vue
index 2626bace363..0241c803514 100644
--- a/app/assets/javascripts/repository/components/last_commit.vue
+++ b/app/assets/javascripts/repository/components/last_commit.vue
@@ -39,7 +39,7 @@ export default {
           path: this.currentPath.replace(/^\//, ''),
         };
       },
-      update: data => {
+      update: (data) => {
         const pipelines = data.project?.repository?.tree?.lastCommit?.pipelines?.edges;
 
         return {
@@ -81,6 +81,10 @@ export default {
     showCommitId() {
       return this.commit?.sha?.substr(0, 8);
     },
+    commitDescription() {
+      // Strip the newline at the beginning
+      return this.commit?.descriptionHtml?.replace(/^
/, '');
+    },
   },
   watch: {
     currentPath() {
@@ -146,10 +150,10 @@ export default {
             <timeago-tooltip :time="commit.authoredDate" tooltip-placement="bottom" />
           </div>
           <pre
-            v-if="commit.descriptionHtml"
+            v-if="commitDescription"
             :class="{ 'd-block': showDescription }"
             class="commit-row-description gl-mb-3"
-            v-html="commit.descriptionHtml"
+            v-html="commitDescription"
           ></pre>
         </div>
         <div class="commit-actions flex-row">
diff --git a/app/assets/javascripts/repository/components/table/parent_row.vue b/app/assets/javascripts/repository/components/table/parent_row.vue
index b4095e00884..fb0e505a16e 100644
--- a/app/assets/javascripts/repository/components/table/parent_row.vue
+++ b/app/assets/javascripts/repository/components/table/parent_row.vue
@@ -25,7 +25,7 @@ export default {
       const splitArray = this.path.split('/');
       splitArray.pop();
 
-      return splitArray.map(p => encodeURIComponent(p)).join('/');
+      return splitArray.map((p) => encodeURIComponent(p)).join('/');
     },
     parentRoute() {
       return { path: `/-/tree/${this.commitRef}/${this.parentPath}` };
@@ -48,9 +48,7 @@ export default {
         inline
         class="d-inline-block align-text-bottom"
       />
-      <router-link v-else :to="parentRoute" :aria-label="__('Go to parent')">
-        ..
-      </router-link>
+      <router-link v-else :to="parentRoute" :aria-label="__('Go to parent')"> .. </router-link>
     </td>
   </tr>
 </template>
diff --git a/app/assets/javascripts/repository/components/tree_content.vue b/app/assets/javascripts/repository/components/tree_content.vue
index b42f88631b5..7fe6863d006 100644
--- a/app/assets/javascripts/repository/components/tree_content.vue
+++ b/app/assets/javascripts/repository/components/tree_content.vue
@@ -113,7 +113,7 @@ export default {
             }
           }
         })
-        .catch(error => {
+        .catch((error) => {
           createFlash(__('An error occurred while fetching folder content.'));
           throw error;
         });
diff --git a/app/assets/javascripts/repository/graphql.js b/app/assets/javascripts/repository/graphql.js
index 8dd18027945..dbe129859bc 100644
--- a/app/assets/javascripts/repository/graphql.js
+++ b/app/assets/javascripts/repository/graphql.js
@@ -18,7 +18,7 @@ const defaultClient = createDefaultClient(
   {
     Query: {
       commit(_, { path, fileName, type }) {
-        return new Promise(resolve => {
+        return new Promise((resolve) => {
           fetchLogsTree(defaultClient, path, '0', {
             resolve,
             entry: {
@@ -38,7 +38,7 @@ const defaultClient = createDefaultClient(
   {
     cacheConfig: {
       fragmentMatcher,
-      dataIdFromObject: obj => {
+      dataIdFromObject: (obj) => {
         /* eslint-disable @gitlab/require-i18n-strings */
         // eslint-disable-next-line no-underscore-dangle
         switch (obj.__typename) {
diff --git a/app/assets/javascripts/repository/log_tree.js b/app/assets/javascripts/repository/log_tree.js
index fc8fa40a855..9001bcd8fc3 100644
--- a/app/assets/javascripts/repository/log_tree.js
+++ b/app/assets/javascripts/repository/log_tree.js
@@ -9,7 +9,9 @@ const fetchpromises = {};
 const resolvers = {};
 
 export function resolveCommit(commits, path, { resolve, entry }) {
-  const commit = commits.find(c => c.filePath === `${path}/${entry.name}` && c.type === entry.type);
+  const commit = commits.find(
+    (c) => c.filePath === `${path}/${entry.name}` && c.type === entry.type,
+  );
 
   if (commit) {
     resolve(commit);
@@ -42,7 +44,7 @@ export function fetchLogsTree(client, path, offset, resolver = null) {
     .then(({ data: newData, headers }) => {
       const headerLogsOffset = headers['more-logs-offset'];
       const sourceData = client.readQuery({ query: commitsQuery });
-      const data = produce(sourceData, draftState => {
+      const data = produce(sourceData, (draftState) => {
         draftState.commits.push(...normalizeData(newData, path));
       });
       client.writeQuery({
@@ -50,7 +52,7 @@ export function fetchLogsTree(client, path, offset, resolver = null) {
         data,
       });
 
-      resolvers[path].forEach(r => resolveCommit(data.commits, path, r));
+      resolvers[path].forEach((r) => resolveCommit(data.commits, path, r));
 
       delete fetchpromises[path];
 
diff --git a/app/assets/javascripts/repository/queries/project_path.query.graphql b/app/assets/javascripts/repository/queries/project_path.query.graphql
index 74e73e07577..9e5c10b3de3 100644
--- a/app/assets/javascripts/repository/queries/project_path.query.graphql
+++ b/app/assets/javascripts/repository/queries/project_path.query.graphql
@@ -1,3 +1,3 @@
 query getProjectPath {
-  projectPath
+  projectPath @client
 }
diff --git a/app/assets/javascripts/repository/router.js b/app/assets/javascripts/repository/router.js
index 38a596e229e..e2924454239 100644
--- a/app/assets/javascripts/repository/router.js
+++ b/app/assets/javascripts/repository/router.js
@@ -10,7 +10,7 @@ Vue.use(VueRouter);
 export default function createRouter(base, baseRef) {
   const treePathRoute = {
     component: TreePage,
-    props: route => ({
+    props: (route) => ({
       path: route.params.path?.replace(/^\//, '') || '/',
     }),
   };
diff --git a/app/assets/javascripts/repository/utils/commit.js b/app/assets/javascripts/repository/utils/commit.js
index 0704ac1627f..a67252ec004 100644
--- a/app/assets/javascripts/repository/utils/commit.js
+++ b/app/assets/javascripts/repository/utils/commit.js
@@ -1,5 +1,5 @@
 export function normalizeData(data, path, extra = () => {}) {
-  return data.map(d => ({
+  return data.map((d) => ({
     sha: d.commit.id,
     message: d.commit.message,
     titleHtml: d.commit_title_html,
diff --git a/app/assets/javascripts/repository/utils/dom.js b/app/assets/javascripts/repository/utils/dom.js
index abf726194ac..b667cd53b18 100644
--- a/app/assets/javascripts/repository/utils/dom.js
+++ b/app/assets/javascripts/repository/utils/dom.js
@@ -1,7 +1,9 @@
 import { joinPaths } from '~/lib/utils/url_utility';
 
 export const updateElementsVisibility = (selector, isVisible) => {
-  document.querySelectorAll(selector).forEach(elem => elem.classList.toggle('hidden', !isVisible));
+  document
+    .querySelectorAll(selector)
+    .forEach((elem) => elem.classList.toggle('hidden', !isVisible));
 };
 
 export const updateFormAction = (selector, basePath, path) => {
diff --git a/app/assets/javascripts/repository/utils/readme.js b/app/assets/javascripts/repository/utils/readme.js
index 50692779b1a..c666cd95038 100644
--- a/app/assets/javascripts/repository/utils/readme.js
+++ b/app/assets/javascripts/repository/utils/readme.js
@@ -18,14 +18,14 @@ const MARKUP_EXTENSIONS = [
   'wiki',
 ];
 
-const isRichReadme = file => {
+const isRichReadme = (file) => {
   const re = new RegExp(`^(${FILENAMES.join('|')})\\.(${MARKUP_EXTENSIONS.join('|')})$`, 'i');
   return re.test(file.name);
 };
 
-const isPlainReadme = file => {
+const isPlainReadme = (file) => {
   const re = new RegExp(`^(${FILENAMES.join('|')})(\\.txt)?$`, 'i');
   return re.test(file.name);
 };
 
-export const readmeFile = blobs => blobs.find(isRichReadme) || blobs.find(isPlainReadme);
+export const readmeFile = (blobs) => blobs.find(isRichReadme) || blobs.find(isPlainReadme);