diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-26 15:08:30 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-26 15:08:30 +0300 |
| commit | d94409aaafb4b59464ebddfaa7821a286a8d1531 (patch) | |
| tree | 1d13062b0ed95e30d6917683b3ff83e2ac138666 /lib/feature.rb | |
| parent | 628f2eef70378076ef96ac0cf7c175d0516a5086 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/feature.rb')
| -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 3847f880be0..6c9bbc39844 100644 --- a/lib/feature.rb +++ b/lib/feature.rb @@ -326,7 +326,11 @@ module Feature end def l2_cache_backend - ::Gitlab::Redis::FeatureFlag.cache_store + if !Gitlab::Utils.to_boolean(ENV['GITLAB_USE_FEATURE_FLAG_REDIS']) + Rails.cache + else + ::Gitlab::Redis::FeatureFlag.cache_store + end end def log(key:, action:, **extra) |