From 48aff82709769b098321c738f3444b9bdaa694c6 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 21 Oct 2020 07:08:36 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-5-stable-ee --- app/helpers/services_helper.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'app/helpers/services_helper.rb') diff --git a/app/helpers/services_helper.rb b/app/helpers/services_helper.rb index 6b5de73a831..114bbf59ae1 100644 --- a/app/helpers/services_helper.rb +++ b/app/helpers/services_helper.rb @@ -24,7 +24,7 @@ module ServicesHelper when "commit", "commit_events" s_("ProjectService|Event will be triggered when a commit is created/updated") when "deployment" - s_("ProjectService|Event will be triggered when a deployment finishes") + s_("ProjectService|Event will be triggered when a deployment starts or finishes") when "alert" s_("ProjectService|Event will be triggered when a new, unique alert is recorded") end @@ -124,6 +124,10 @@ module ServicesHelper @group.present? && Feature.enabled?(:group_level_integrations, @group) end + def instance_level_integrations? + !Gitlab.com? + end + extend self private -- cgit v1.2.1