diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-10-05 18:14:18 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-10-05 18:14:18 +0300 |
| commit | 393331b40bc9044b658896028869d29eed126a71 (patch) | |
| tree | f03a0675848d549b89659fb8edce25ac31a7b8a3 /lib | |
| parent | fb61f7e0463396ff9e49330671cec57ce6483d9b (diff) | |
| parent | 75ddf0d48d0fee6f9209376b0751d414946f9c67 (diff) | |
Merge branch '5699-enabling-disabling-features-does-not-propagate-correctly-to-geo-secondaries' into 'master'
Backport a refactor on the Feature.flipper method to CE
See merge request gitlab-org/gitlab-ce!22152
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/feature.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/feature.rb b/lib/feature.rb index 0e90ad9a333..a8324d99c10 100644 --- 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 |