Skip to content
Snippets Groups Projects
Commit ea5221ae authored by Robert Speicher's avatar Robert Speicher
Browse files

Merge branch 'sh-fix-module-reloading' into 'master'

Fix "A copy of Gitlab::Metrics::Methods" have been removed error

Closes #44365

See merge request gitlab-org/gitlab-ce!17810
parents 88bd9bac 02d2a789
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -50,7 +50,7 @@ module Gitlab
end
 
def disabled_by_feature(options)
options.with_feature && !Feature.get(options.with_feature).enabled?
options.with_feature && !::Feature.get(options.with_feature).enabled?
end
 
def build_metric!(type, name, options)
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment