diff options
Diffstat (limited to 'app/services/issues/close_service.rb')
| -rw-r--r-- | app/services/issues/close_service.rb | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/app/services/issues/close_service.rb b/app/services/issues/close_service.rb index 8594808cd44..e431c766df8 100644 --- a/app/services/issues/close_service.rb +++ b/app/services/issues/close_service.rb @@ -33,6 +33,7 @@ module Issues notification_service.async.close_issue(issue, current_user, closed_via: closed_via) if notifications todo_service.close_issue(issue, current_user) + resolve_alert(issue) execute_hooks(issue, 'close') invalidate_cache_counts(issue, users: issue.assignees) issue.update_project_counter_caches @@ -58,6 +59,22 @@ module Issues SystemNoteService.change_status(issue, issue.project, current_user, issue.state, current_commit) end + def resolve_alert(issue) + return unless alert = issue.alert_management_alert + return if alert.resolved? + + if alert.resolve + SystemNotes::AlertManagementService.new(noteable: alert, project: alert.project, author: current_user).closed_alert_issue(issue) + else + Gitlab::AppLogger.warn( + message: 'Cannot resolve an associated Alert Management alert', + issue_id: issue.id, + alert_id: alert.id, + alert_errors: alert.errors.messages + ) + end + end + def store_first_mentioned_in_commit_at(issue, merge_request) metrics = issue.metrics return if metrics.nil? || metrics.first_mentioned_in_commit_at |