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

7 files changed, 30 insertions, 25 deletions

diff --git a/app/assets/javascripts/snippets/components/edit.vue b/app/assets/javascripts/snippets/components/edit.vue
index 08683f25651..ffb5e242973 100644
--- a/app/assets/javascripts/snippets/components/edit.vue
+++ b/app/assets/javascripts/snippets/components/edit.vue
@@ -73,7 +73,7 @@ export default {
       return this.actions.length > 0;
     },
     hasValidBlobs() {
-      return this.actions.every(x => x.content);
+      return this.actions.every((x) => x.content);
     },
     updatePrevented() {
       return this.snippet.title === '' || !this.hasValidBlobs || this.isUpdating;
@@ -130,7 +130,7 @@ export default {
     },
     getAttachedFiles() {
       const fileInputs = Array.from(this.$el.querySelectorAll('[name="files[]"]'));
-      return fileInputs.map(node => node.value);
+      return fileInputs.map((node) => node.value);
     },
     createMutation() {
       return {
@@ -166,7 +166,7 @@ export default {
             redirectTo(baseObj.snippet.webUrl);
           }
         })
-        .catch(e => {
+        .catch((e) => {
           this.flashAPIFailure(e);
         });
     },
diff --git a/app/assets/javascripts/snippets/components/snippet_blob_actions_edit.vue b/app/assets/javascripts/snippets/components/snippet_blob_actions_edit.vue
index ab2553265a2..ff27c90a84d 100644
--- a/app/assets/javascripts/snippets/components/snippet_blob_actions_edit.vue
+++ b/app/assets/javascripts/snippets/components/snippet_blob_actions_edit.vue
@@ -74,7 +74,7 @@ export default {
 
     this.blobsOrig = blobsById;
     this.blobs = cloneDeep(blobsById);
-    this.blobIds = blobs.map(x => x.id);
+    this.blobIds = blobs.map((x) => x.id);
 
     // Show 1 empty blob if none exist
     if (!this.blobIds.length) {
@@ -108,7 +108,7 @@ export default {
       this.blobIds.push(blob.id);
     },
     deleteBlob(id) {
-      this.blobIds = this.blobIds.filter(x => x !== id);
+      this.blobIds = this.blobIds.filter((x) => x !== id);
       this.$delete(this.blobs, id);
     },
     updateBlob(id, args) {
diff --git a/app/assets/javascripts/snippets/components/snippet_blob_edit.vue b/app/assets/javascripts/snippets/components/snippet_blob_edit.vue
index 6a10dc38f2c..c8545e334a6 100644
--- a/app/assets/javascripts/snippets/components/snippet_blob_edit.vue
+++ b/app/assets/javascripts/snippets/components/snippet_blob_edit.vue
@@ -55,12 +55,12 @@ export default {
       axios
         .get(url, {
           // This prevents axios from automatically JSON.parse response
-          transformResponse: [f => f],
+          transformResponse: [(f) => f],
         })
-        .then(res => {
+        .then((res) => {
           this.notifyAboutUpdates({ content: res.data });
         })
-        .catch(e => this.flashAPIFailure(e));
+        .catch((e) => this.flashAPIFailure(e));
     },
     flashAPIFailure(err) {
       Flash(sprintf(SNIPPET_BLOB_CONTENT_FETCH_ERROR, { err }));
diff --git a/app/assets/javascripts/snippets/components/snippet_blob_view.vue b/app/assets/javascripts/snippets/components/snippet_blob_view.vue
index b965c15306d..4326c3c3159 100644
--- a/app/assets/javascripts/snippets/components/snippet_blob_view.vue
+++ b/app/assets/javascripts/snippets/components/snippet_blob_view.vue
@@ -41,6 +41,11 @@ export default {
       },
     },
   },
+  provide() {
+    return {
+      blobHash: Math.random().toString().split('.')[1],
+    };
+  },
   props: {
     snippet: {
       type: Object,
@@ -51,13 +56,6 @@ export default {
       required: true,
     },
   },
-  provide() {
-    return {
-      blobHash: Math.random()
-        .toString()
-        .split('.')[1],
-    };
-  },
   data() {
     return {
       blobContent: '',
@@ -90,7 +88,7 @@ export default {
       const {
         blobs: { nodes: dataBlobs },
       } = data.snippets.nodes[0];
-      const updatedBlobData = dataBlobs.find(blob => blob.path === blobPath);
+      const updatedBlobData = dataBlobs.find((blob) => blob.path === blobPath);
       return updatedBlobData.richData || updatedBlobData.plainData;
     },
   },
diff --git a/app/assets/javascripts/snippets/components/snippet_header.vue b/app/assets/javascripts/snippets/components/snippet_header.vue
index 32c4c1039f5..5ba62908b43 100644
--- a/app/assets/javascripts/snippets/components/snippet_header.vue
+++ b/app/assets/javascripts/snippets/components/snippet_header.vue
@@ -69,7 +69,7 @@ export default {
   },
   computed: {
     snippetHasBinary() {
-      return Boolean(this.snippet.blobs.find(blob => blob.binary));
+      return Boolean(this.snippet.blobs.find((blob) => blob.binary));
     },
     authoredMessage() {
       return this.snippet.author
@@ -164,7 +164,7 @@ export default {
           this.closeDeleteModal();
           this.redirectToSnippets();
         })
-        .catch(err => {
+        .catch((err) => {
           this.isDeleting = false;
           this.errorMessage = err.message;
         });
@@ -200,6 +200,13 @@ export default {
               <gl-avatar :size="24" :src="snippet.author.avatarUrl" />
               <span class="bold">{{ snippet.author.name }}</span>
             </a>
+            <gl-emoji
+              v-if="snippet.author.status"
+              v-gl-tooltip
+              class="gl-vertical-align-baseline font-size-inherit gl-mr-1"
+              :title="snippet.author.status.message"
+              :data-name="snippet.author.status.emoji"
+            />
           </template>
         </gl-sprintf>
       </div>
diff --git a/app/assets/javascripts/snippets/mixins/snippets.js b/app/assets/javascripts/snippets/mixins/snippets.js
index 5844a55e4f5..89a88958152 100644
--- a/app/assets/javascripts/snippets/mixins/snippets.js
+++ b/app/assets/javascripts/snippets/mixins/snippets.js
@@ -11,7 +11,7 @@ export const getSnippetMixin = {
           ids: [this.snippetGid],
         };
       },
-      update: data => {
+      update: (data) => {
         const res = data.snippets.nodes[0];
         if (res) {
           res.blobs = res.blobs.nodes;
diff --git a/app/assets/javascripts/snippets/utils/blob.js b/app/assets/javascripts/snippets/utils/blob.js
index 5081c648e36..a47418323f2 100644
--- a/app/assets/javascripts/snippets/utils/blob.js
+++ b/app/assets/javascripts/snippets/utils/blob.js
@@ -12,7 +12,7 @@ import { SNIPPET_MARK_BLOBS_CONTENT, SNIPPET_MEASURE_BLOBS_CONTENT } from '~/per
 
 const createLocalId = () => uniqueId('blob_local_');
 
-export const decorateBlob = blob => ({
+export const decorateBlob = (blob) => ({
   ...blob,
   id: createLocalId(),
   isLoaded: false,
@@ -54,7 +54,7 @@ const diff = ({ content, path }, origBlob) => {
  */
 export const diffAll = (blobs, origBlobs) => {
   const deletedEntries = Object.values(origBlobs)
-    .filter(x => !blobs[x.id])
+    .filter((x) => !blobs[x.id])
     .map(({ path, content }) => ({
       action: SNIPPET_BLOB_ACTION_DELETE,
       previousPath: path,
@@ -63,15 +63,15 @@ export const diffAll = (blobs, origBlobs) => {
     }));
 
   const newEntries = Object.values(blobs)
-    .map(blob => diff(blob, origBlobs[blob.id]))
-    .filter(x => x);
+    .map((blob) => diff(blob, origBlobs[blob.id]))
+    .filter((x) => x);
 
   return [...deletedEntries, ...newEntries];
 };
 
-export const defaultSnippetVisibilityLevels = arr => {
+export const defaultSnippetVisibilityLevels = (arr) => {
   if (Array.isArray(arr)) {
-    return arr.map(l => {
+    return arr.map((l) => {
       const translatedLevel = SNIPPET_LEVELS_MAP[l];
       return {
         value: translatedLevel,