summaryrefslogtreecommitdiff
path: root/lib/api/helpers/services_helpers.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-09-25 12:06:15 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-09-25 12:06:15 +0000
commitaabf412bc1f30cb12d97a077458d002c57cad8e9 (patch)
tree1e06ef9d3a5b1b835be6cb75ef8c5a7e362ee3ed /lib/api/helpers/services_helpers.rb
parent1cfd8874ee6702184d5608f533b30bab722b4f9d (diff)
downloadgitlab-ce-aabf412bc1f30cb12d97a077458d002c57cad8e9.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api/helpers/services_helpers.rb')
-rw-r--r--lib/api/helpers/services_helpers.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/helpers/services_helpers.rb b/lib/api/helpers/services_helpers.rb
index eba4ebb4b6e..2475e384a50 100644
--- a/lib/api/helpers/services_helpers.rb
+++ b/lib/api/helpers/services_helpers.rb
@@ -155,6 +155,7 @@ module API
def self.services
{
+ 'alerts' => [],
'asana' => [
{
required: true,
@@ -696,6 +697,7 @@ module API
def self.service_classes
[
+ ::AlertsService,
::AsanaService,
::AssemblaService,
::BambooService,