Add latest changes from gitlab-org/gitlab@master

4 files changed, 9 insertions, 4 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 997fadec602..755287bf8a1 100644
--- a/app/assets/javascripts/issues/show/components/incidents/incident_tabs.vue
+++ b/app/assets/javascripts/issues/show/components/incidents/incident_tabs.vue
@@ -35,7 +35,7 @@ export default {
     IncidentMetricTab: () =>
       import('ee_component/issues/show/components/incidents/incident_metric_tab.vue'),
   },
-  inject: ['fullPath', 'iid', 'uploadMetricsFeatureAvailable'],
+  inject: ['fullPath', 'iid', 'hasLinkedAlerts', 'uploadMetricsFeatureAvailable'],
   i18n: incidentTabsI18n,
   apollo: {
     alert: {
@@ -72,7 +72,7 @@ export default {
       if (this.uploadMetricsFeatureAvailable) {
         availableTabs.push(TAB_NAMES.METRICS);
       }
-      if (this.alert) {
+      if (this.hasLinkedAlerts) {
         availableTabs.push(TAB_NAMES.ALERTS);
       }
 
@@ -153,7 +153,7 @@ export default {
         <incident-metric-tab />
       </gl-tab>
       <gl-tab
-        v-if="alert"
+        v-if="hasLinkedAlerts"
         class="alert-management-details"
         :title="$options.i18n.alertsTitle"
         data-testid="alert-details-tab"
diff --git a/app/assets/javascripts/issues/show/index.js b/app/assets/javascripts/issues/show/index.js
index b89ee3cf22e..52ed8bbc798 100644
--- a/app/assets/javascripts/issues/show/index.js
+++ b/app/assets/javascripts/issues/show/index.js
@@ -39,6 +39,7 @@ export function initIncidentApp(issueData = {}, store) {
     projectNamespace,
     projectPath,
     projectId,
+    hasLinkedAlerts,
     slaFeatureAvailable,
     uploadMetricsFeatureAvailable,
     state,
@@ -60,6 +61,7 @@ export function initIncidentApp(issueData = {}, store) {
       iid,
       issuableId,
       projectId,
+      hasLinkedAlerts: parseBoolean(hasLinkedAlerts),
       slaFeatureAvailable: parseBoolean(slaFeatureAvailable),
       uploadMetricsFeatureAvailable: parseBoolean(uploadMetricsFeatureAvailable),
       contentEditorOnIssues: gon.features.contentEditorOnIssues,
diff --git a/app/models/concerns/issuable.rb b/app/models/concerns/issuable.rb
index 50696c7b5e1..4ba0eead599 100644
--- a/app/models/concerns/issuable.rb
+++ b/app/models/concerns/issuable.rb
@@ -658,6 +658,10 @@ module Issuable
 
     { name: name, subject: self }
   end
+
+  def supports_health_status?
+    false
+  end
 end
 
 Issuable.prepend_mod_with('Issuable')
diff --git a/app/views/notify/new_review_email.text.erb b/app/views/notify/new_review_email.text.erb
index 7bf878aefd0..69cb33b05df 100644
--- a/app/views/notify/new_review_email.text.erb
+++ b/app/views/notify/new_review_email.text.erb
@@ -4,7 +4,6 @@
 
 --
 <% @notes.each_with_index do |note, index| %>
-  <!-- Get preloaded note discussion-->
   <% discussion = @discussions[note.discussion_id] if note.part_of_discussion?%>
   <% target_url = project_merge_request_url(@project, @merge_request, anchor: "note_#{note.id}") %>
   <%= render 'note_email', note: note, diff_limit: 3, target_url: target_url, discussion: discussion, author: @author %>