diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 16:37:47 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 16:37:47 +0300 |
commit | aee0a117a889461ce8ced6fcf73207fe017f1d99 (patch) | |
tree | 891d9ef189227a8445d83f35c1b0fc99573f4380 /app/mailers/emails/projects.rb | |
parent | 8d46af3258650d305f53b819eabf7ab18d22f59e (diff) |
Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42
Diffstat (limited to 'app/mailers/emails/projects.rb')
-rw-r--r-- | app/mailers/emails/projects.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/mailers/emails/projects.rb b/app/mailers/emails/projects.rb index 06ba16f9724..14c724b5b91 100644 --- a/app/mailers/emails/projects.rb +++ b/app/mailers/emails/projects.rb @@ -59,6 +59,7 @@ module Emails def prometheus_alert_fired_email(project, user, alert) @project = project @alert = alert.present + @incident = alert.issue add_project_headers add_alert_headers @@ -80,11 +81,10 @@ module Emails end def add_incident_headers - incident = @alert.issue - return unless incident + return unless @incident - headers['X-GitLab-Incident-ID'] = incident.id - headers['X-GitLab-Incident-IID'] = incident.iid + headers['X-GitLab-Incident-ID'] = @incident.id + headers['X-GitLab-Incident-IID'] = @incident.iid end end end |