Merge remote-tracking branch 'upstream/master' into ce-to-ee-2018-03-17

0d28c5c1 · GitLab Bot · 771cc617 · ea5221ae · 0d28c5c1
Commit 0d28c5c1 authored Mar 17, 2018 by GitLab Bot
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

lib/gitlab/metrics/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)