Commit d566a31e authored by Ash McKenzie's avatar Ash McKenzie

Merge branch 'fix_copy_active_methods' into 'master'

Fix auto-loading of Gitlab::Metrics::Methods

See merge request gitlab-org/gitlab!53798
parents 54c5a90e 5fbbd7ab
...@@ -39,7 +39,7 @@ module Gitlab ...@@ -39,7 +39,7 @@ module Gitlab
options.evaluate(&block) options.evaluate(&block)
if disabled_by_feature(options) if disabled_by_feature(options)
synchronized_cache_fill(name) { NullMetric.instance } synchronized_cache_fill(name) { ::Gitlab::Metrics::NullMetric.instance }
else else
synchronized_cache_fill(name) { build_metric!(type, name, options) } synchronized_cache_fill(name) { build_metric!(type, name, options) }
end end
......
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