1 files changed, 22 insertions, 24 deletions
diff --git a/app/models/integrations/discord.rb b/app/models/integrations/discord.rb
index ec8a12e4760..d0389b82410 100644
--- a/app/models/integrations/discord.rb
+++ b/app/models/integrations/discord.rb
@@ -6,6 +6,24 @@ module Integrations
   class Discord < BaseChatNotification
     ATTACHMENT_REGEX = /: (?<entry>.*?)\n - (?<name>.*)\n*/.freeze
 
+    undef :notify_only_broken_pipelines
+
+    field :webhook,
+      section: SECTION_TYPE_CONNECTION,
+      placeholder: 'https://discordapp.com/api/webhooks/…',
+      help: 'URL to the webhook for the Discord channel.',
+      required: true
+
+    field :notify_only_broken_pipelines,
+      type: 'checkbox',
+      section: SECTION_TYPE_CONFIGURATION
+
+    field :branches_to_be_notified,
+      type: 'select',
+      section: SECTION_TYPE_CONFIGURATION,
+      title: -> { s_('Integrations|Branches for which notifications are to be sent') },
+      choices: -> { branch_choices }
+
     def title
       s_("DiscordService|Discord Notifications")
     end
@@ -18,6 +36,10 @@ module Integrations
       "discord"
     end
 
+    def fields
+      self.class.fields + build_event_channels
+    end
+
     def help
       docs_link = ActionController::Base.helpers.link_to _('How do I set up this service?'), Rails.application.routes.url_helpers.help_page_url('user/project/integrations/discord_notifications'), target: '_blank', rel: 'noopener noreferrer'
       s_('Send notifications about project events to a Discord channel. %{docs_link}').html_safe % { docs_link: docs_link.html_safe }
@@ -31,30 +53,6 @@ module Integrations
       %w[push issue confidential_issue merge_request note confidential_note tag_push pipeline wiki_page]
     end
 
-    def default_fields
-      [
-        {
-          type: 'text',
-          section: SECTION_TYPE_CONNECTION,
-          name: 'webhook',
-          placeholder: 'https://discordapp.com/api/webhooks/…',
-          help: 'URL to the webhook for the Discord channel.'
-        },
-        {
-          type: 'checkbox',
-          section: SECTION_TYPE_CONFIGURATION,
-          name: 'notify_only_broken_pipelines'
-        },
-        {
-          type: 'select',
-          section: SECTION_TYPE_CONFIGURATION,
-          name: 'branches_to_be_notified',
-          title: s_('Integrations|Branches for which notifications are to be sent'),
-          choices: self.class.branch_choices
-        }
-      ]
-    end
-
     def sections
       [
         {