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/system_check')
-rw-r--r--lib/system_check/app/redis_version_check.rb6
-rw-r--r--lib/system_check/incoming_email/imap_authentication_check.rb2
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