Add latest changes from gitlab-org/gitlab@13-1-stable-ee

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",