diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-24 03:09:38 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-24 03:09:38 +0000 |
| commit | 3ff77f7f70cea745600379a6d434b3aafa12de01 (patch) | |
| tree | 00898538e0459f2d0c20dbba722a5868f9294f5c /lib | |
| parent | cbb3bdad0677b0d7f6bf51b26be56a1bd049d0b1 (diff) | |
| download | gitlab-ce-3ff77f7f70cea745600379a6d434b3aafa12de01.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/redis/wrapper.rb | 2 | ||||
| -rw-r--r-- | lib/system_check/incoming_email/imap_authentication_check.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/redis/wrapper.rb b/lib/gitlab/redis/wrapper.rb index 6f80c7d439f..0fa7d7ba643 100644 --- a/lib/gitlab/redis/wrapper.rb +++ b/lib/gitlab/redis/wrapper.rb @@ -142,7 +142,7 @@ module Gitlab def fetch_config return false unless self.class._raw_config - yaml = YAML.load(self.class._raw_config) + yaml = YAML.safe_load(self.class._raw_config) # If the file has content but it's invalid YAML, `load` returns false if yaml diff --git a/lib/system_check/incoming_email/imap_authentication_check.rb b/lib/system_check/incoming_email/imap_authentication_check.rb index 056021d460c..0f87daef439 100644 --- a/lib/system_check/incoming_email/imap_authentication_check.rb +++ b/lib/system_check/incoming_email/imap_authentication_check.rb @@ -52,7 +52,7 @@ module SystemCheck def load_config erb = ERB.new(File.read(mail_room_config_path)) erb.filename = mail_room_config_path - config_file = YAML.load(erb.result) + config_file = YAML.safe_load(erb.result) config_file[:mailboxes] end |