diff options
Diffstat (limited to 'app/services/system_notes')
-rw-r--r-- | app/services/system_notes/alert_management_service.rb | 20 | ||||
-rw-r--r-- | app/services/system_notes/issuables_service.rb | 2 |
2 files changed, 18 insertions, 4 deletions
diff --git a/app/services/system_notes/alert_management_service.rb b/app/services/system_notes/alert_management_service.rb index 55a6a17bbca..f835376727a 100644 --- a/app/services/system_notes/alert_management_service.rb +++ b/app/services/system_notes/alert_management_service.rb @@ -12,7 +12,7 @@ module SystemNotes # # Returns the created Note object def change_alert_status(alert) - status = AlertManagement::Alert::STATUSES.key(alert.status).to_s.titleize + status = alert.state.to_s.titleize body = "changed the status to **#{status}**" create_note(NoteSummary.new(noteable, project, author, body, action: 'status')) @@ -20,7 +20,6 @@ module SystemNotes # Called when an issue is created based on an AlertManagement::Alert # - # alert - AlertManagement::Alert object. # issue - Issue object. # # Example Note text: @@ -28,10 +27,25 @@ module SystemNotes # "created issue #17 for this alert" # # Returns the created Note object - def new_alert_issue(alert, issue) + def new_alert_issue(issue) body = "created issue #{issue.to_reference(project)} for this alert" create_note(NoteSummary.new(noteable, project, author, body, action: 'alert_issue_added')) end + + # Called when an AlertManagement::Alert is resolved due to the associated issue being closed + # + # issue - Issue object. + # + # Example Note text: + # + # "changed the status to Resolved by closing issue #17" + # + # Returns the created Note object + def closed_alert_issue(issue) + body = "changed the status to **Resolved** by closing issue #{issue.to_reference(project)}" + + create_note(NoteSummary.new(noteable, project, author, body, action: 'status')) + end end end diff --git a/app/services/system_notes/issuables_service.rb b/app/services/system_notes/issuables_service.rb index 76261aa716e..7535db54130 100644 --- a/app/services/system_notes/issuables_service.rb +++ b/app/services/system_notes/issuables_service.rb @@ -341,7 +341,7 @@ module SystemNotes def state_change_tracking_enabled? noteable.respond_to?(:resource_state_events) && - ::Feature.enabled?(:track_resource_state_change_events, noteable.project) + ::Feature.enabled?(:track_resource_state_change_events, noteable.project, default_enabled: true) end end end |