Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSemyon Pupkov <mail@semyonpupkov.com>2016-12-13 22:54:50 +0300
committerSemyon Pupkov <mail@semyonpupkov.com>2017-01-13 08:41:50 +0300
commita532c6040c1c150810122b172a2fad30d1753dfd (patch)
tree477dcb195d7a7b2fcb09e49b8c39d7e0ffdc6495 /lib
parentf80ab37cc1450fb9dc61149dbc10c245f3681e45 (diff)
Allow to use ENV variables in redis config
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/redis.rb2
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