Add latest changes from gitlab-org/gitlab@master

4 files changed, 14 insertions, 4 deletions

diff --git a/app/models/integrations/base_chat_notification.rb b/app/models/integrations/base_chat_notification.rb
index 2c929dc2cb3..e6936318f42 100644
--- a/app/models/integrations/base_chat_notification.rb
+++ b/app/models/integrations/base_chat_notification.rb
@@ -13,6 +13,8 @@ module Integrations
       tag_push pipeline wiki_page deployment incident
     ].freeze
 
+    GROUP_ONLY_SUPPORTED_EVENTS = %w[group_mention group_confidential_mention].freeze
+
     SUPPORTED_EVENTS_FOR_LABEL_FILTER = %w[issue confidential_issue merge_request note confidential_note].freeze
 
     EVENT_CHANNEL = proc { |event| "#{event}_channel" }
@@ -30,6 +32,7 @@ module Integrations
 
     # Custom serialized properties initialization
     prop_accessor(*SUPPORTED_EVENTS.map { |event| EVENT_CHANNEL[event] })
+    prop_accessor(*GROUP_ONLY_SUPPORTED_EVENTS.map { |event| EVENT_CHANNEL[event] })
 
     boolean_accessor :notify_only_default_branch
 
@@ -251,6 +254,8 @@ module Integrations
         Integrations::ChatMessage::DeploymentMessage.new(data) if notify_for_ref?(data)
       when "incident"
         Integrations::ChatMessage::IssueMessage.new(data) unless update?(data)
+      when "group_mention"
+        Integrations::ChatMessage::GroupMentionMessage.new(data)
       end
     end
     # rubocop:enable Metrics/CyclomaticComplexity
diff --git a/app/models/integrations/base_slack_notification.rb b/app/models/integrations/base_slack_notification.rb
index 65aec8b278f..09a0c9ba361 100644
--- a/app/models/integrations/base_slack_notification.rb
+++ b/app/models/integrations/base_slack_notification.rb
@@ -7,8 +7,6 @@ module Integrations
     ].freeze
 
     prop_accessor EVENT_CHANNEL['alert']
-    prop_accessor EVENT_CHANNEL['group_mention']
-    prop_accessor EVENT_CHANNEL['group_confidential_mention']
 
     override :default_channel_placeholder
     def default_channel_placeholder
@@ -18,7 +16,6 @@ module Integrations
     override :get_message
     def get_message(object_kind, data)
       return Integrations::ChatMessage::AlertMessage.new(data) if object_kind == 'alert'
-      return Integrations::ChatMessage::GroupMentionMessage.new(data) if object_kind == 'group_mention'
 
       super
     end
diff --git a/app/models/integrations/discord.rb b/app/models/integrations/discord.rb
index 7917d17eb62..33b2b52fa62 100644
--- a/app/models/integrations/discord.rb
+++ b/app/models/integrations/discord.rb
@@ -42,6 +42,13 @@ module Integrations
       s_('DiscordService|Override the default webhook (e.g. https://discord.com/api/webhooks/…)')
     end
 
+    override :supported_events
+    def supported_events
+      additional = group_level? ? %w[group_mention group_confidential_mention] : []
+
+      (self.class.supported_events + additional).freeze
+    end
+
     def self.supported_events
       %w[push issue confidential_issue merge_request note confidential_note tag_push pipeline wiki_page deployment]
     end
diff --git a/app/models/users/callout.rb b/app/models/users/callout.rb
index 0136cc6bb2d..60dd89c3ee7 100644
--- a/app/models/users/callout.rb
+++ b/app/models/users/callout.rb
@@ -75,7 +75,8 @@ module Users
       namespace_over_storage_users_combined_alert: 73, # EE-only
       # 74 removed in https://gitlab.com/gitlab-org/gitlab/-/merge_requests/132751
       vsd_feedback_banner: 75, # EE-only
-      security_policy_protected_branch_modification: 76 # EE-only
+      security_policy_protected_branch_modification: 76, # EE-only
+      vulnerability_report_grouping: 77 # EE-only
     }
 
     validates :feature_name,