summaryrefslogtreecommitdiff
path: root/app/workers
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-06-04 14:17:05 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-06-04 14:17:05 +0000
commit2b171e66adf713653c04005e08c02dd823622bdb (patch)
tree977965c0f9e4c93fa66c1f02b876391df115ac97 /app/workers
parentbab5bdce96a258068d69c4b2811f036f151ed60b (diff)
downloadgitlab-ce-2b171e66adf713653c04005e08c02dd823622bdb.tar.gz
Add latest changes from gitlab-org/gitlab@13-0-stable-ee
Diffstat (limited to 'app/workers')
-rw-r--r--app/workers/incident_management/process_alert_worker.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/workers/incident_management/process_alert_worker.rb b/app/workers/incident_management/process_alert_worker.rb
index 2ce9fe359b5..0af34fa35d5 100644
--- a/app/workers/incident_management/process_alert_worker.rb
+++ b/app/workers/incident_management/process_alert_worker.rb
@@ -12,7 +12,7 @@ module IncidentManagement
return unless project
new_issue = create_issue(project, alert_payload)
- return unless am_alert_id && new_issue.persisted?
+ return unless am_alert_id && new_issue&.persisted?
link_issue_with_alert(am_alert_id, new_issue.id)
end
@@ -27,6 +27,7 @@ module IncidentManagement
IncidentManagement::CreateIssueService
.new(project, alert_payload)
.execute
+ .dig(:issue)
end
def link_issue_with_alert(alert_id, issue_id)