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
This commit is contained in:
Robert Speicher 2018-03-16 22:11:10 +00:00
commit ea5221aeb3
1 changed files with 1 additions and 1 deletions

View File

@ -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)