diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 09:55:51 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-07-20 09:55:51 +0000 |
| commit | e8d2c2579383897a1dd7f9debd359abe8ae8373d (patch) | |
| tree | c42be41678c2586d49a75cabce89322082698334 /app/helpers/projects | |
| parent | fc845b37ec3a90aaa719975f607740c22ba6a113 (diff) | |
| download | gitlab-ce-e8d2c2579383897a1dd7f9debd359abe8ae8373d.tar.gz | |
Add latest changes from gitlab-org/gitlab@14-1-stable-eev14.1.0-rc42
Diffstat (limited to 'app/helpers/projects')
| -rw-r--r-- | app/helpers/projects/alert_management_helper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/projects/alert_management_helper.rb b/app/helpers/projects/alert_management_helper.rb index b46e3eb3bc3..b50e287a509 100644 --- a/app/helpers/projects/alert_management_helper.rb +++ b/app/helpers/projects/alert_management_helper.rb @@ -29,13 +29,13 @@ module Projects::AlertManagementHelper private def has_managed_prometheus?(project) - project.prometheus_service&.prometheus_available? == true + project.prometheus_integration&.prometheus_available? == true end def alert_management_enabled?(project) !!( project.alert_management_alerts.any? || - project.prometheus_service_active? || + project.prometheus_integration_active? || AlertManagement::HttpIntegrationsFinder.new(project, active: true).execute.any? ) end |