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

Merge branch 'sh-fix-module-reloading' into 'master'
ea5221ae · Robert Speicher · 88bd9bac · 02d2a789 · ea5221ae
Commit ea5221ae authored Mar 16, 2018 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

methods.rb lib/gitlab/metrics/methods.rb +1 -1

No files found.
--- a/lib/gitlab/metrics/methods.rb
+++ b/lib/gitlab/metrics/methods.rb
@@ -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)