diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-11 18:09:23 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-11 18:09:23 +0000 |
| commit | 76e9fc7b29c1ce716c26932e9fbec0f3c99f53f4 (patch) | |
| tree | b5ca8e3a6b2cf93b67257b38ee71e2efee177700 /lib/feature.rb | |
| parent | a210c43e0aca0311cc1d3d381763b25979ec72dc (diff) | |
| download | gitlab-ce-76e9fc7b29c1ce716c26932e9fbec0f3c99f53f4.tar.gz | |
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 aadc2c64957..37cbe33f7c9 100644 --- a/lib/feature.rb +++ b/lib/feature.rb @@ -134,7 +134,11 @@ class Feature end def l1_cache_backend - Gitlab::ThreadMemoryCache.cache_backend + if Gitlab::Utils.to_boolean(ENV['USE_THREAD_MEMORY_CACHE']) + Gitlab::ThreadMemoryCache.cache_backend + else + Gitlab::ProcessMemoryCache.cache_backend + end end def l2_cache_backend |