Commit c48f1056 authored by Bob Van Landuyt's avatar Bob Van Landuyt

Merge branch 'pl-alerts-service-fix-broken-foss' into 'master'

Reference AlertsService only in EE

See merge request gitlab-org/gitlab!17702
parents fb5c6865 3a269c24
......@@ -12,6 +12,7 @@ module EE
override :services
def services
super.merge(
'alerts' => [],
'github' => [
{
required: true,
......
......@@ -155,7 +155,6 @@ module API
def self.services
{
'alerts' => [],
'asana' => [
{
required: true,
......@@ -697,7 +696,6 @@ module API
def self.service_classes
[
::AlertsService,
::AsanaService,
::AssemblaService,
::BambooService,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment