Add latest changes from gitlab-org/gitlab@master

1 files changed, 11 insertions, 2 deletions

diff --git a/app/assets/javascripts/issues/show/components/incidents/incident_tabs.vue b/app/assets/javascripts/issues/show/components/incidents/incident_tabs.vue
index ea0e15adfed..cf750176fce 100644
--- a/app/assets/javascripts/issues/show/components/incidents/incident_tabs.vue
+++ b/app/assets/javascripts/issues/show/components/incidents/incident_tabs.vue
@@ -65,17 +65,26 @@ export default {
       Tracking.event(category, action);
     },
     handleTabChange(tabIndex) {
+      /**
+       * TODO: Implement a solution that does not violate Vue principles in using
+       * DOM manipulation directly (#361618)
+       */
       const parent = document.querySelector('.js-issue-details');
 
       if (parent !== null) {
         const itemsToHide = parent.querySelectorAll('.js-issue-widgets');
         const lineSeparator = parent.querySelector('.js-detail-page-description');
+        const editButton = document.querySelector('.js-issuable-edit');
+        const isSummaryTab = tabIndex === 0;
 
-        lineSeparator.classList.toggle('gl-border-b-0', tabIndex > 0);
+        lineSeparator.classList.toggle('gl-border-b-0', !isSummaryTab);
 
         itemsToHide.forEach(function hide(item) {
-          item.classList.toggle('gl-display-none', tabIndex > 0);
+          item.classList.toggle('gl-display-none', !isSummaryTab);
         });
+
+        editButton.classList.toggle('gl-display-none', !isSummaryTab);
+        editButton.classList.toggle('gl-sm-display-inline-flex!', isSummaryTab);
       }
     },
   },