Skip to content

G
gitlab-ce
Commit aa8ef510 authored by Stan Hu's avatar Stan Hu
Browse files
Options

Resolve conflicts in lib/gitlab/prometheus/queries/query_additional_metrics.rb

parent 40c94334
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
lib/gitlab/prometheus/queries/query_additional_metrics.rb
View file @ aa8ef510
...@@ -2,11 +2,8 @@ module Gitlab ...@@ -2,11 +2,8 @@ module Gitlab
module Prometheus module Prometheus
module Queries module Queries
module QueryAdditionalMetrics module QueryAdditionalMetrics
<<<<<<< HEAD
prepend EE::Gitlab::Prometheus::Queries::QueryAdditionalMetrics prepend EE::Gitlab::Prometheus::Queries::QueryAdditionalMetrics
=======
>>>>>>> upstream/master
def query_metrics(project, environment, query_context) def query_metrics(project, environment, query_context)
matched_metrics(project).map(&query_group(query_context)) matched_metrics(project).map(&query_group(query_context))
.select(&method(:group_with_any_metrics)) .select(&method(:group_with_any_metrics))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7