diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-01-13 16:08:48 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-01-13 16:08:48 +0000 |
| commit | 5384c720c9c7443fc1f12ea15d55541e14feeb85 (patch) | |
| tree | 95e874857f9122d4005935e59f09605b7b8093bf /lib | |
| parent | 7a3ddc5214618dd9a1b761acde3502d78a66ba8c (diff) | |
| parent | a532c6040c1c150810122b172a2fad30d1753dfd (diff) | |
| download | gitlab-ce-5384c720c9c7443fc1f12ea15d55541e14feeb85.tar.gz | |
Merge branch 'env-var-in-redis-config' into 'master'
Allow to use ENV variables in redis config
See merge request !8073
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/redis.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/redis.rb b/lib/gitlab/redis.rb index 9226da2d6b1..9384102acec 100644 --- a/lib/gitlab/redis.rb +++ b/lib/gitlab/redis.rb @@ -42,7 +42,7 @@ module Gitlab return @_raw_config if defined?(@_raw_config) begin - @_raw_config = File.read(CONFIG_FILE).freeze + @_raw_config = ERB.new(File.read(CONFIG_FILE)).result.freeze rescue Errno::ENOENT @_raw_config = false end |