Merge branch 'ce-to-ee-2018-03-17' into 'master'

CE upstream - 2018-03-17 00:26 UTC

See merge request gitlab-org/gitlab-ee!5005

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)