diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 07:08:36 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-10-21 07:08:36 +0000 |
commit | 48aff82709769b098321c738f3444b9bdaa694c6 (patch) | |
tree | e00c7c43e2d9b603a5a6af576b1685e400410dee /app/helpers/services_helper.rb | |
parent | 879f5329ee916a948223f8f43d77fba4da6cd028 (diff) | |
download | gitlab-ce-48aff82709769b098321c738f3444b9bdaa694c6.tar.gz |
Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42
Diffstat (limited to 'app/helpers/services_helper.rb')
-rw-r--r-- | app/helpers/services_helper.rb | 6 |
1 files changed, 5 insertions, 1 deletions
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 |