diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-05 06:12:41 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-05-05 06:12:41 +0000 |
| commit | 7c0c3a7dc95668d20ec8f4bbc2d505f373b6032a (patch) | |
| tree | 2034e645e8aada36db5d816d271d7f2d8728157d /lib/gitlab | |
| parent | d8abaef3c6859400b684427ba57aa247b6272cb1 (diff) | |
| download | gitlab-ce-7c0c3a7dc95668d20ec8f4bbc2d505f373b6032a.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab')
| -rw-r--r-- | lib/gitlab/redis/wrapper.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/gitlab/redis/wrapper.rb b/lib/gitlab/redis/wrapper.rb index 288d5db15c6..45fe04835cc 100644 --- a/lib/gitlab/redis/wrapper.rb +++ b/lib/gitlab/redis/wrapper.rb @@ -55,15 +55,11 @@ module Gitlab def config_file_name [ # Instance specific config sources: - ENV["GITLAB_REDIS_#{store_name.underscore.upcase}_CONFIG_FILE"], config_file_path("redis.#{store_name.underscore}.yml"), # The current Redis instance may have been split off from another one # (e.g. TraceChunks was split off from SharedState). - config_fallback&.config_file_name, - - # Global config sources: - ENV['GITLAB_REDIS_CONFIG_FILE'] + config_fallback&.config_file_name ].compact.first end |