diff options
author | Robert Speicher <robert@gitlab.com> | 2018-03-16 22:11:10 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2018-03-16 22:11:10 +0000 |
commit | ea5221aeb358ef6c349cfa09b9c6993bd7bd027d (patch) | |
tree | dd2864981dfa77a2b76b5395e6e58e5dbe963dfe | |
parent | 88bd9bac93f9a719486ccd4b4b1bc393b0bee422 (diff) | |
parent | 02d2a789d2a8a906f76aa2720560b4659f164d2c (diff) | |
download | gitlab-ce-ea5221aeb358ef6c349cfa09b9c6993bd7bd027d.tar.gz |
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
-rw-r--r-- | lib/gitlab/metrics/methods.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/metrics/methods.rb b/lib/gitlab/metrics/methods.rb index cd7c1e507f7..f79eb0cd1bf 100644 --- 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) |