Add latest changes from gitlab-org/gitlab@master

1 files changed, 11 insertions, 0 deletions

diff --git a/app/models/alert_management/alert.rb b/app/models/alert_management/alert.rb
index 35fae370e4a..564ef024c21 100644
--- a/app/models/alert_management/alert.rb
+++ b/app/models/alert_management/alert.rb
@@ -150,8 +150,19 @@ module AlertManagement
       ''
     end
 
+    def execute_services
+      return unless Feature.enabled?(:alert_slack_event, project)
+      return unless project.has_active_services?(:alert_hooks)
+
+      project.execute_services(hook_data, :alert_hooks)
+    end
+
     private
 
+    def hook_data
+      Gitlab::DataBuilder::Alert.build(self)
+    end
+
     def hosts_length
       return unless hosts