diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 10:34:06 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-18 10:34:06 +0000 |
commit | 859a6fb938bb9ee2a317c46dfa4fcc1af49608f0 (patch) | |
tree | d7f2700abe6b4ffcb2dcfc80631b2d87d0609239 /lib/gitlab/config/loader | |
parent | 446d496a6d000c73a304be52587cd9bbc7493136 (diff) | |
download | gitlab-ce-859a6fb938bb9ee2a317c46dfa4fcc1af49608f0.tar.gz |
Add latest changes from gitlab-org/gitlab@13-9-stable-eev13.9.0-rc42
Diffstat (limited to 'lib/gitlab/config/loader')
-rw-r--r-- | lib/gitlab/config/loader/yaml.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/gitlab/config/loader/yaml.rb b/lib/gitlab/config/loader/yaml.rb index cb3fc49944c..80c9abecd8e 100644 --- a/lib/gitlab/config/loader/yaml.rb +++ b/lib/gitlab/config/loader/yaml.rb @@ -12,8 +12,12 @@ module Gitlab MAX_YAML_SIZE = 1.megabyte MAX_YAML_DEPTH = 100 - def initialize(config) - @config = YAML.safe_load(config, [Symbol], [], true) + def initialize(config, additional_permitted_classes: []) + @config = YAML.safe_load(config, + permitted_classes: [Symbol, *additional_permitted_classes], + permitted_symbols: [], + aliases: true + ) rescue Psych::Exception => e raise Loader::FormatError, e.message end |