diff options
| author | Eugenia Grieff <egrieff@gitlab.com> | 2019-08-07 12:18:37 +0100 |
|---|---|---|
| committer | Eugenia Grieff <egrieff@gitlab.com> | 2019-08-07 12:18:37 +0100 |
| commit | e8619bbdd904cbd10cc0a92f44f2044ad572bc10 (patch) | |
| tree | 58ee3a0f48608cae55e618b41e01fae276dbdb79 /app/models/concerns/prometheus_adapter.rb | |
| parent | 90dc8b77b75564915eb14df9fe346f90f0ddf880 (diff) | |
| parent | 84e7bc765c42643e8d1b30e4030172694f33901a (diff) | |
| download | gitlab-ce-7250-group-bulk-edit-issues-mrs-epics-change-label-ce.tar.gz | |
Fix merge master conflicts7250-group-bulk-edit-issues-mrs-epics-change-label-ce
Diffstat (limited to 'app/models/concerns/prometheus_adapter.rb')
| -rw-r--r-- | app/models/concerns/prometheus_adapter.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/models/concerns/prometheus_adapter.rb b/app/models/concerns/prometheus_adapter.rb index c2542dbe743..9ac4722c6b1 100644 --- a/app/models/concerns/prometheus_adapter.rb +++ b/app/models/concerns/prometheus_adapter.rb @@ -14,10 +14,6 @@ module PrometheusAdapter raise NotImplementedError end - def prometheus_client_wrapper - Gitlab::PrometheusClient.new(prometheus_client) - end - def can_query? prometheus_client.present? end @@ -35,7 +31,7 @@ module PrometheusAdapter def calculate_reactive_cache(query_class_name, *args) return unless prometheus_client - data = Object.const_get(query_class_name, false).new(prometheus_client_wrapper).query(*args) + data = Object.const_get(query_class_name, false).new(prometheus_client).query(*args) { success: true, data: data, |