Add latest changes from gitlab-org/gitlab@master

2 files changed, 19 insertions, 9 deletions

diff --git a/app/assets/javascripts/issue_show/components/description.vue b/app/assets/javascripts/issue_show/components/description.vue
index 9cf46be5345..4c586f6c3a6 100644
--- a/app/assets/javascripts/issue_show/components/description.vue
+++ b/app/assets/javascripts/issue_show/components/description.vue
@@ -48,11 +48,16 @@ export default {
     return {
       preAnimation: false,
       pulseAnimation: false,
+      initialUpdate: true,
     };
   },
   watch: {
-    descriptionHtml() {
-      this.animateChange();
+    descriptionHtml(newDescription, oldDescription) {
+      if (!this.initialUpdate && newDescription !== oldDescription) {
+        this.animateChange();
+      } else {
+        this.initialUpdate = false;
+      }
 
       this.$nextTick(() => {
         this.renderGFM();
diff --git a/app/assets/javascripts/issue_show/components/pinned_links.vue b/app/assets/javascripts/issue_show/components/pinned_links.vue
index 36375ca743b..d38189307bd 100644
--- a/app/assets/javascripts/issue_show/components/pinned_links.vue
+++ b/app/assets/javascripts/issue_show/components/pinned_links.vue
@@ -20,20 +20,25 @@ export default {
   },
   computed: {
     pinnedLinks() {
-      return [
-        {
+      const links = [];
+      if (this.publishedIncidentUrl) {
+        links.push({
           id: 'publishedIncidentUrl',
           url: this.publishedIncidentUrl,
           text: STATUS_PAGE_PUBLISHED,
           icon: 'tanuki',
-        },
-        {
+        });
+      }
+      if (this.zoomMeetingUrl) {
+        links.push({
           id: 'zoomMeetingUrl',
           url: this.zoomMeetingUrl,
           text: JOIN_ZOOM_MEETING,
           icon: 'brand-zoom',
-        },
-      ];
+        });
+      }
+
+      return links;
     },
   },
   methods: {
@@ -45,7 +50,7 @@ export default {
 </script>
 
 <template>
-  <div class="gl-display-flex gl-justify-content-start">
+  <div v-if="pinnedLinks && pinnedLinks.length" class="gl-display-flex gl-justify-content-start">
     <template v-for="(link, i) in pinnedLinks">
       <div v-if="link.url" :key="link.id" :class="{ 'gl-pr-3': needsPaddingClass(i) }">
         <gl-button