diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-10 20:36:29 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-01-10 20:36:29 +0000 |
commit | 1eef146c2d1de19d4e995d421e5787053e50db80 (patch) | |
tree | 2761efabea712248557826977a849e31e3fdb961 /app/models/concerns | |
parent | 661d663ab2b7c69977ba8a0db02ef4afc2427e39 (diff) | |
download | gitlab-ce-1eef146c2d1de19d4e995d421e5787053e50db80.tar.gz |
Add latest changes from gitlab-org/security/gitlab@14-6-stable-ee
Diffstat (limited to 'app/models/concerns')
-rw-r--r-- | app/models/concerns/integrations/slack_mattermost_notifier.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/models/concerns/integrations/slack_mattermost_notifier.rb b/app/models/concerns/integrations/slack_mattermost_notifier.rb index cb6fafa8de0..be13701289a 100644 --- a/app/models/concerns/integrations/slack_mattermost_notifier.rb +++ b/app/models/concerns/integrations/slack_mattermost_notifier.rb @@ -6,6 +6,13 @@ module Integrations def notify(message, opts) # See https://gitlab.com/gitlab-org/slack-notifier/#custom-http-client + # + # TODO: By default both Markdown and HTML links are converted into Slack "mrkdwn" syntax, + # but it seems we only need to support Markdown and could disable HTML. + # + # See: + # - https://gitlab.com/gitlab-org/slack-notifier#middleware + # - https://gitlab.com/gitlab-org/gitlab/-/issues/347048 notifier = ::Slack::Messenger.new(webhook, opts.merge(http_client: HTTPClient)) notifier.ping( message.pretext, |