diff options
| author | Bob Van Landuyt <bob@vanlanduyt.co> | 2017-08-07 15:54:30 +0200 |
|---|---|---|
| committer | Bob Van Landuyt <bob@vanlanduyt.co> | 2017-08-07 15:54:30 +0200 |
| commit | fda83a6179ae63f094410942e95951b40c3ad24b (patch) | |
| tree | 953676e495926c1458517173a26d6a0716ba9183 | |
| parent | faabcbd3ae06d5587713cbb466d1f3666aeaa96b (diff) | |
| download | gitlab-ce-fda83a6179ae63f094410942e95951b40c3ad24b.tar.gz | |
Use correct `Environment`-class within `Gitlab` namespace
| -rw-r--r-- | lib/gitlab/prometheus/queries/additional_metrics_environment_query.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/prometheus/queries/environment_query.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/usage_data.rb | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/gitlab/prometheus/queries/additional_metrics_environment_query.rb b/lib/gitlab/prometheus/queries/additional_metrics_environment_query.rb index db4708b22e4..32fe8201a8d 100644 --- a/lib/gitlab/prometheus/queries/additional_metrics_environment_query.rb +++ b/lib/gitlab/prometheus/queries/additional_metrics_environment_query.rb @@ -5,7 +5,7 @@ module Gitlab include QueryAdditionalMetrics def query(environment_id) - Environment.find_by(id: environment_id).try do |environment| + ::Environment.find_by(id: environment_id).try do |environment| query_metrics( common_query_context(environment, timeframe_start: 8.hours.ago.to_f, timeframe_end: Time.now.to_f) ) diff --git a/lib/gitlab/prometheus/queries/environment_query.rb b/lib/gitlab/prometheus/queries/environment_query.rb index 66f29d95177..1d17d3cfd56 100644 --- a/lib/gitlab/prometheus/queries/environment_query.rb +++ b/lib/gitlab/prometheus/queries/environment_query.rb @@ -3,7 +3,7 @@ module Gitlab module Queries class EnvironmentQuery < BaseQuery def query(environment_id) - Environment.find_by(id: environment_id).try do |environment| + ::Environment.find_by(id: environment_id).try do |environment| environment_slug = environment.slug timeframe_start = 8.hours.ago.to_f timeframe_end = Time.now.to_f diff --git a/lib/gitlab/usage_data.rb b/lib/gitlab/usage_data.rb index e0ac21305a5..748e0a29184 100644 --- a/lib/gitlab/usage_data.rb +++ b/lib/gitlab/usage_data.rb @@ -27,8 +27,8 @@ module Gitlab ci_pipeline_schedules: ::Ci::PipelineSchedule.count, deploy_keys: DeployKey.count, deployments: Deployment.count, - environments: Environment.count, - in_review_folder: Environment.in_review_folder.count, + environments: ::Environment.count, + in_review_folder: ::Environment.in_review_folder.count, groups: Group.count, issues: Issue.count, keys: Key.count, |