Commit 08ceb01b authored by Kamil Trzciński's avatar Kamil Trzciński

Merge branch 'allow-aliases-for-redis-yml' into 'master'

Allow aliases when parsing Redis configuration

See merge request gitlab-org/gitlab!60251
parents b8db8324 868e8be1
......@@ -142,7 +142,7 @@ module Gitlab
def fetch_config
return false unless self.class._raw_config
yaml = YAML.safe_load(self.class._raw_config)
yaml = YAML.safe_load(self.class._raw_config, aliases: true)
# If the file has content but it's invalid YAML, `load` returns false
if yaml
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment