diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-06-22 19:42:35 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-06-22 19:42:35 +0000 |
| commit | 6e66473fa65e5f806f24cb4ef5929f29463c41a6 (patch) | |
| tree | 51025c8de69b5826ef25e1ef1df34f1aabfc1231 | |
| parent | bf0b3d835211077cb10ee3aec9ee6e0bca2304b6 (diff) | |
| parent | 6661b0b8e0232e9ad8df783a7bee90deb5b78e54 (diff) | |
| download | gitlab-ce-6e66473fa65e5f806f24cb4ef5929f29463c41a6.tar.gz | |
Merge branch '33940-cache-flipper_gate-query' into 'master'
Add the Flipper::Middleware::Memoizer middleware
Closes #33940
See merge request !12359
| -rw-r--r-- | config/initializers/flipper.rb | 4 | ||||
| -rw-r--r-- | lib/feature.rb | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/config/initializers/flipper.rb b/config/initializers/flipper.rb new file mode 100644 index 00000000000..0fee832788d --- /dev/null +++ b/config/initializers/flipper.rb @@ -0,0 +1,4 @@ +require 'flipper/middleware/memoizer' + +Rails.application.config.middleware.use Flipper::Middleware::Memoizer, + lambda { Feature.flipper } diff --git a/lib/feature.rb b/lib/feature.rb index 5650a1c1334..d3d972564af 100644 --- a/lib/feature.rb +++ b/lib/feature.rb @@ -39,8 +39,6 @@ class Feature get(key).disable end - private - def flipper @flipper ||= begin adapter = Flipper::Adapters::ActiveRecord.new( |