diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-05-19 18:44:42 +0300 |
| commit | 4555e1b21c365ed8303ffb7a3325d773c9b8bf31 (patch) | |
| tree | 5423a1c7516cffe36384133ade12572cf709398d /lib/system_check/incoming_email/imap_authentication_check.rb | |
| parent | e570267f2f6b326480d284e0164a6464ba4081bc (diff) | |
Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42
Diffstat (limited to 'lib/system_check/incoming_email/imap_authentication_check.rb')
| -rw-r--r-- | lib/system_check/incoming_email/imap_authentication_check.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/system_check/incoming_email/imap_authentication_check.rb b/lib/system_check/incoming_email/imap_authentication_check.rb index 056021d460c..61719abc991 100644 --- a/lib/system_check/incoming_email/imap_authentication_check.rb +++ b/lib/system_check/incoming_email/imap_authentication_check.rb @@ -35,7 +35,7 @@ module SystemCheck imap.login(mailbox[:email], mailbox[:password]) end true - rescue => error + rescue StandardError => error @error = error false end @@ -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 |