diff options
author | Robert Speicher <robert@gitlab.com> | 2017-12-14 20:56:24 +0300 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2017-12-14 20:56:24 +0300 |
commit | a8f2e659ece8b161d6ea9774493de000f80353b2 (patch) | |
tree | e564e6e3f94ea3f6ef5d00bed1e64cae22b17540 /lib | |
parent | 26484cf125c49465ba32c9a95f9655c4e4a8fbdf (diff) | |
parent | b51e6d6ddc7bf9ffdb9d82debfeaee4942e01659 (diff) |
Merge branch 'rc/update-flipper' into 'master'
Update flipper to 0.11.0 and take advantage of the new features
See merge request gitlab-org/gitlab-ce!15920
Diffstat (limited to 'lib')
-rw-r--r-- | lib/feature.rb | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/lib/feature.rb b/lib/feature.rb index ac3bc65c0d5..8e9ba5c530a 100644 --- a/lib/feature.rb +++ b/lib/feature.rb @@ -1,5 +1,3 @@ -require 'flipper/adapters/active_record' - class Feature # Classes to override flipper table names class FlipperFeature < Flipper::Adapters::ActiveRecord::Feature @@ -62,12 +60,7 @@ class Feature end def flipper - @flipper ||= begin - adapter = Flipper::Adapters::ActiveRecord.new( - feature_class: FlipperFeature, gate_class: FlipperGate) - - Flipper.new(adapter) - end + @flipper ||= Flipper.instance end # This method is called from config/initializers/flipper.rb and can be used |