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
diff options
context:
space:
mode:
Diffstat (limited to 'lib/gitlab/config/loader/yaml.rb')
-rw-r--r--lib/gitlab/config/loader/yaml.rb8
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