summaryrefslogtreecommitdiff
path: root/spec/support
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-15 21:08:49 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-15 21:08:49 +0000
commitcf1d4237a4f226ba2deed26240544da0675a41e5 (patch)
tree926a71b9279659bc52db0187b463603934718bf2 /spec/support
parent0ac82f99553ce12009970a14c0afc02d1f6515bb (diff)
downloadgitlab-ce-cf1d4237a4f226ba2deed26240544da0675a41e5.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/support')
-rw-r--r--spec/support/shared_contexts/services_shared_context.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/spec/support/shared_contexts/services_shared_context.rb b/spec/support/shared_contexts/services_shared_context.rb
index c526c8aba7c..21bc0651c44 100644
--- a/spec/support/shared_contexts/services_shared_context.rb
+++ b/spec/support/shared_contexts/services_shared_context.rb
@@ -32,8 +32,7 @@ Service.available_services_names.each do |service|
{
'github' => :github_project_service_integration,
'jenkins' => :jenkins_integration,
- 'jenkins_deprecated' => :jenkins_integration,
- 'alerts' => :incident_management
+ 'jenkins_deprecated' => :jenkins_integration
}
end