diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-23 17:57:46 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-23 17:57:46 +0300 |
| commit | 64fc6a9b19faca58ad0087b1a1cb11f7ed910015 (patch) | |
| tree | fe4e98cfab4289850ee15965ae0b04648ee90207 /app/helpers | |
| parent | 6317794da29af0bccf95dece5b57b2be2c0977a4 (diff) | |
Add latest changes from gitlab-org/gitlab@13-6-stable-ee
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/projects/alert_management_helper.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/helpers/projects/alert_management_helper.rb b/app/helpers/projects/alert_management_helper.rb index 5ce3736c8ef..c6ad6bfac01 100644 --- a/app/helpers/projects/alert_management_helper.rb +++ b/app/helpers/projects/alert_management_helper.rb @@ -27,7 +27,11 @@ module Projects::AlertManagementHelper private def alert_management_enabled?(project) - !!(project.alerts_service_activated? || project.prometheus_service_active?) + !!( + project.alerts_service_activated? || + project.prometheus_service_active? || + AlertManagement::HttpIntegrationsFinder.new(project, active: true).execute.any? + ) end end |