Refactor Feature.flipper method

75ddf0d4 · Douglas Barbosa Alexandre · 88fa9a3c · 75ddf0d4
Commit 75ddf0d4 authored Oct 05, 2018 by Douglas Barbosa Alexandre
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

lib/feature.rb lib/feature.rb +5 -1

No files found.
--- a/lib/feature.rb
+++ b/lib/feature.rb
@@ -72,7 +72,11 @@ class Feature
    end

    def flipper
-      @flipper ||= (Gitlab::SafeRequestStore[:flipper] ||= build_flipper_instance)
+      if Gitlab::SafeRequestStore.active?
+        Gitlab::SafeRequestStore[:flipper] ||= build_flipper_instance
+      else
+        @flipper ||= build_flipper_instance
+      end
    end

    def build_flipper_instance