Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42

1 files changed, 24 insertions, 0 deletions

diff --git a/app/models/concerns/integrations/slack_mattermost_notifier.rb b/app/models/concerns/integrations/slack_mattermost_notifier.rb
new file mode 100644
index 00000000000..a919fc840fd
--- /dev/null
+++ b/app/models/concerns/integrations/slack_mattermost_notifier.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+module Integrations
+  module SlackMattermostNotifier
+    private
+
+    def notify(message, opts)
+      # See https://gitlab.com/gitlab-org/slack-notifier/#custom-http-client
+      notifier = ::Slack::Messenger.new(webhook, opts.merge(http_client: HTTPClient))
+      notifier.ping(
+        message.pretext,
+        attachments: message.attachments,
+        fallback: message.fallback
+      )
+    end
+
+    class HTTPClient
+      def self.post(uri, params = {})
+        params.delete(:http_options) # these are internal to the client and we do not want them
+        Gitlab::HTTP.post(uri, body: params)
+      end
+    end
+  end
+end