diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /lib/gitlab/config | |
parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'lib/gitlab/config')
-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 4cedab1545c..e001742a7f8 100644 --- a/lib/gitlab/config/loader/yaml.rb +++ b/lib/gitlab/config/loader/yaml.rb @@ -21,11 +21,15 @@ module Gitlab hash? && !too_big? end - def load! + def load_raw! raise DataTooLargeError, 'The parsed YAML is too big' if too_big? raise Loader::FormatError, 'Invalid configuration format' unless hash? - @config.deep_symbolize_keys + @config + end + + def load! + @symbolized_config ||= load_raw!.deep_symbolize_keys end private |