diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:25:58 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-06-16 18:25:58 +0000 |
commit | a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch) | |
tree | fb69158581673816a8cd895f9d352dcb3c678b1e /lib/system_check | |
parent | d16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff) | |
download | gitlab-ce-a5f4bba440d7f9ea47046a0a561d49adf0a1e6d4.tar.gz |
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'lib/system_check')
-rw-r--r-- | lib/system_check/app/redis_version_check.rb | 6 | ||||
-rw-r--r-- | lib/system_check/incoming_email/imap_authentication_check.rb | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/system_check/app/redis_version_check.rb b/lib/system_check/app/redis_version_check.rb index e72d8b6b04d..d907c041ad8 100644 --- a/lib/system_check/app/redis_version_check.rb +++ b/lib/system_check/app/redis_version_check.rb @@ -5,9 +5,9 @@ require 'redis' module SystemCheck module App class RedisVersionCheck < SystemCheck::BaseCheck - # Redis 4.x will be deprecated - # https://gitlab.com/gitlab-org/gitlab/-/issues/327197 - MIN_REDIS_VERSION = '4.0.0' + # Redis 5.x will be deprecated + # https://gitlab.com/gitlab-org/gitlab/-/issues/331468 + MIN_REDIS_VERSION = '5.0.0' RECOMMENDED_REDIS_VERSION = '5.0.0' set_name "Redis version >= #{RECOMMENDED_REDIS_VERSION}?" diff --git a/lib/system_check/incoming_email/imap_authentication_check.rb b/lib/system_check/incoming_email/imap_authentication_check.rb index 61719abc991..e02ae81dc98 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.safe_load(erb.result) + config_file = YAML.safe_load(erb.result, permitted_classes: [Symbol]) config_file[:mailboxes] end |