diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /lib/gitlab/data_builder | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'lib/gitlab/data_builder')
-rw-r--r-- | lib/gitlab/data_builder/alert.rb | 27 | ||||
-rw-r--r-- | lib/gitlab/data_builder/note.rb | 2 |
2 files changed, 28 insertions, 1 deletions
diff --git a/lib/gitlab/data_builder/alert.rb b/lib/gitlab/data_builder/alert.rb new file mode 100644 index 00000000000..e34bdeea799 --- /dev/null +++ b/lib/gitlab/data_builder/alert.rb @@ -0,0 +1,27 @@ +# frozen_string_literal: true + +module Gitlab + module DataBuilder + module Alert + extend self + + def build(alert) + { + object_kind: 'alert', + object_attributes: hook_attrs(alert) + } + end + + def hook_attrs(alert) + { + title: alert.title, + url: Gitlab::Routing.url_helpers.details_project_alert_management_url(alert.project, alert.iid), + severity: alert.severity, + events: alert.events, + status: alert.status_name, + started_at: alert.started_at + } + end + end + end +end diff --git a/lib/gitlab/data_builder/note.rb b/lib/gitlab/data_builder/note.rb index 2c4ef73a688..73518d36d43 100644 --- a/lib/gitlab/data_builder/note.rb +++ b/lib/gitlab/data_builder/note.rb @@ -55,7 +55,7 @@ module Gitlab end def build_base_data(project, user, note) - event_type = note.confidential? ? 'confidential_note' : 'note' + event_type = note.confidential?(include_noteable: true) ? 'confidential_note' : 'note' base_data = { object_kind: "note", |