diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 18:18:33 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-03-16 18:18:33 +0000 |
commit | f64a639bcfa1fc2bc89ca7db268f594306edfd7c (patch) | |
tree | a2c3c2ebcc3b45e596949db485d6ed18ffaacfa1 /app/services/system_notes | |
parent | bfbc3e0d6583ea1a91f627528bedc3d65ba4b10f (diff) | |
download | gitlab-ce-f64a639bcfa1fc2bc89ca7db268f594306edfd7c.tar.gz |
Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40
Diffstat (limited to 'app/services/system_notes')
-rw-r--r-- | app/services/system_notes/alert_management_service.rb | 15 | ||||
-rw-r--r-- | app/services/system_notes/issuables_service.rb | 8 | ||||
-rw-r--r-- | app/services/system_notes/merge_requests_service.rb | 4 |
3 files changed, 23 insertions, 4 deletions
diff --git a/app/services/system_notes/alert_management_service.rb b/app/services/system_notes/alert_management_service.rb index 376f2c1cfbf..27ddf2e36f1 100644 --- a/app/services/system_notes/alert_management_service.rb +++ b/app/services/system_notes/alert_management_service.rb @@ -62,5 +62,20 @@ module SystemNotes create_note(NoteSummary.new(noteable, project, author, body, action: 'status')) end + + # Called when an alert is resolved due to received resolving alert payload + # + # alert - AlertManagement::Alert object. + # + # Example Note text: + # + # "changed the status to Resolved by closing issue #17" + # + # Returns the created Note object + def log_resolving_alert(monitoring_tool) + body = "logged a resolving alert from **#{monitoring_tool}**" + + create_note(NoteSummary.new(noteable, project, User.alert_bot, body, action: 'new_alert_added')) + end end end diff --git a/app/services/system_notes/issuables_service.rb b/app/services/system_notes/issuables_service.rb index b344b240a07..60dd56e772a 100644 --- a/app/services/system_notes/issuables_service.rb +++ b/app/services/system_notes/issuables_service.rb @@ -125,8 +125,8 @@ module SystemNotes old_diffs, new_diffs = Gitlab::Diff::InlineDiff.new(old_title, new_title).inline_diffs - marked_old_title = Gitlab::Diff::InlineDiffMarkdownMarker.new(old_title).mark(old_diffs, mode: :deletion) - marked_new_title = Gitlab::Diff::InlineDiffMarkdownMarker.new(new_title).mark(new_diffs, mode: :addition) + marked_old_title = Gitlab::Diff::InlineDiffMarkdownMarker.new(old_title).mark(old_diffs) + marked_new_title = Gitlab::Diff::InlineDiffMarkdownMarker.new(new_title).mark(new_diffs) body = "changed title from **#{marked_old_title}** to **#{marked_new_title}**" @@ -354,6 +354,10 @@ module SystemNotes create_note(NoteSummary.new(noteable, project, author, body, action: 'duplicate')) end + def add_email_participants(body) + create_note(NoteSummary.new(noteable, project, author, body)) + end + def discussion_lock action = noteable.discussion_locked? ? 'locked' : 'unlocked' body = "#{action} this #{noteable.class.to_s.titleize.downcase}" diff --git a/app/services/system_notes/merge_requests_service.rb b/app/services/system_notes/merge_requests_service.rb index 99e03e67bf1..546a23c95c2 100644 --- a/app/services/system_notes/merge_requests_service.rb +++ b/app/services/system_notes/merge_requests_service.rb @@ -90,14 +90,14 @@ module SystemNotes # Example Note text is based on event_type: # # update: "changed target branch from `Old` to `New`" - # delete: "changed automatically target branch to `New` because `Old` was deleted" + # delete: "deleted the `Old` branch. This merge request now targets the `New` branch" # # Returns the created Note object def change_branch(branch_type, event_type, old_branch, new_branch) body = case event_type.to_s when 'delete' - "changed automatically #{branch_type} branch to `#{new_branch}` because `#{old_branch}` was deleted" + "deleted the `#{old_branch}` branch. This merge request now targets the `#{new_branch}` branch" when 'update' "changed #{branch_type} branch from `#{old_branch}` to `#{new_branch}`" else |