diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-19 15:57:54 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-19 15:57:54 +0300 |
commit | 419c53ec62de6e97a517abd5fdd4cbde3a942a34 (patch) | |
tree | 1f43a548b46bca8a5fb8fe0c31cef1883d49c5b6 /app/models/integrations/telegram.rb | |
parent | 1da20d9135b3ad9e75e65b028bffc921aaf8deb7 (diff) |
Add latest changes from gitlab-org/gitlab@16-5-stable-eev16.5.0-rc42
Diffstat (limited to 'app/models/integrations/telegram.rb')
-rw-r--r-- | app/models/integrations/telegram.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/app/models/integrations/telegram.rb b/app/models/integrations/telegram.rb index 7c196720386..71fe6f8d6ef 100644 --- a/app/models/integrations/telegram.rb +++ b/app/models/integrations/telegram.rb @@ -26,6 +26,12 @@ module Integrations section: SECTION_TYPE_CONFIGURATION, help: 'If selected, successful pipelines do not trigger a notification event.' + 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 } + with_options if: :activated? do validates :token, :room, presence: true end @@ -60,6 +66,10 @@ module Integrations super - ['deployment'] end + def avatar_url + ActionController::Base.helpers.image_path('illustrations/third-party-logos/integrations-logos/telegram.svg') + end + private def set_webhook |