diff options
| author | Pawel Chojnacki <pawel@chojnacki.ws> | 2018-02-24 01:06:08 +0100 |
|---|---|---|
| committer | Pawel Chojnacki <pawel@chojnacki.ws> | 2018-02-24 01:06:08 +0100 |
| commit | 0feeddaa0f4831e53d8d094b0cbb84222524431a (patch) | |
| tree | fc85165cc60ea0e7bb8c671b97ef1592d2177e78 /app | |
| parent | 22e2cad910171bd3ed54ce65da55169c4c6d70b7 (diff) | |
| download | gitlab-ce-0feeddaa0f4831e53d8d094b0cbb84222524431a.tar.gz | |
drop the ! from synchronize_service_state! + remove unused scope
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/clusters/cluster.rb | 2 | ||||
| -rw-r--r-- | app/models/project_services/prometheus_service.rb | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/app/models/clusters/cluster.rb b/app/models/clusters/cluster.rb index 1fd7db30107..5ecbd4cbceb 100644 --- a/app/models/clusters/cluster.rb +++ b/app/models/clusters/cluster.rb @@ -49,8 +49,6 @@ module Clusters scope :enabled, -> { where(enabled: true) } scope :disabled, -> { where(enabled: false) } - scope :for_environment, -> (env) { where(environment_scope: ['*', '', env.slug]) } - def status_name if provider provider.status_name diff --git a/app/models/project_services/prometheus_service.rb b/app/models/project_services/prometheus_service.rb index 7a0c9a33e70..dcaeb65dc32 100644 --- a/app/models/project_services/prometheus_service.rb +++ b/app/models/project_services/prometheus_service.rb @@ -9,7 +9,7 @@ class PrometheusService < MonitoringService validates :api_url, url: true end - before_save :synchronize_service_state! + before_save :synchronize_service_state after_save :clear_reactive_cache! @@ -82,7 +82,7 @@ class PrometheusService < MonitoringService private - def synchronize_service_state! + def synchronize_service_state self.active = prometheus_installed? || manual_configuration? true |