Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2024-01-22 03:10:19 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2024-01-22 03:10:19 +0300
commit4d90876cc6b35bc418ccb6ea2536581289b272fb (patch)
treea74ea127264fa7deaaf4f1067b94687541343e8c /lib/api/helpers/integrations_helpers.rb
parent61d7d07541aafcf49a97159a6048cf6847adbd51 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api/helpers/integrations_helpers.rb')
-rw-r--r--lib/api/helpers/integrations_helpers.rb5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/api/helpers/integrations_helpers.rb b/lib/api/helpers/integrations_helpers.rb
index b450718a7d0..85a13edfd89 100644
--- a/lib/api/helpers/integrations_helpers.rb
+++ b/lib/api/helpers/integrations_helpers.rb
@@ -222,6 +222,10 @@ module API
}
],
'external-wiki' => ::Integrations::ExternalWiki.api_fields,
+ 'gitlab-slack-application' => [
+ ::Integrations::GitlabSlackApplication.api_fields,
+ chat_notification_channels
+ ].flatten,
'google-play' => ::Integrations::GooglePlay.api_fields,
'hangouts-chat' => [
{
@@ -638,6 +642,7 @@ module API
::Integrations::EmailsOnPush,
::Integrations::Ewm,
::Integrations::ExternalWiki,
+ ::Integrations::GitlabSlackApplication,
::Integrations::GooglePlay,
::Integrations::HangoutsChat,
::Integrations::Harbor,