diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-17 14:59:07 +0300 |
commit | 8b573c94895dc0ac0e1d9d59cf3e8745e8b539ca (patch) | |
tree | 544930fb309b30317ae9797a9683768705d664c4 /app/helpers/projects/alert_management_helper.rb | |
parent | 4b1de649d0168371549608993deac953eb692019 (diff) |
Add latest changes from gitlab-org/gitlab@13-7-stable-eev13.7.0-rc42
Diffstat (limited to 'app/helpers/projects/alert_management_helper.rb')
-rw-r--r-- | app/helpers/projects/alert_management_helper.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/helpers/projects/alert_management_helper.rb b/app/helpers/projects/alert_management_helper.rb index c6ad6bfac01..997551d9659 100644 --- a/app/helpers/projects/alert_management_helper.rb +++ b/app/helpers/projects/alert_management_helper.rb @@ -28,7 +28,7 @@ module Projects::AlertManagementHelper def alert_management_enabled?(project) !!( - project.alerts_service_activated? || + project.alert_management_alerts.any? || project.prometheus_service_active? || AlertManagement::HttpIntegrationsFinder.new(project, active: true).execute.any? ) |