Add latest changes from gitlab-org/gitlab@13-3-stable-ee

3 files changed, 4 insertions, 4 deletions

diff --git a/lib/system_check/app/git_version_check.rb b/lib/system_check/app/git_version_check.rb
index 08c8df9b044..0709f783f09 100644
--- a/lib/system_check/app/git_version_check.rb
+++ b/lib/system_check/app/git_version_check.rb
@@ -7,7 +7,7 @@ module SystemCheck
       set_check_pass -> { "yes (#{self.current_version})" }
 
       def self.required_version
-        @required_version ||= Gitlab::VersionInfo.parse('2.22.0')
+        @required_version ||= Gitlab::VersionInfo.parse('2.24.0')
       end
 
       def self.current_version
diff --git a/lib/system_check/app/redis_version_check.rb b/lib/system_check/app/redis_version_check.rb
index aca2972f287..aff0ee52e0d 100644
--- a/lib/system_check/app/redis_version_check.rb
+++ b/lib/system_check/app/redis_version_check.rb
@@ -5,8 +5,8 @@ require 'redis'
 module SystemCheck
   module App
     class RedisVersionCheck < SystemCheck::BaseCheck
-      MIN_REDIS_VERSION = '3.2.0'
-      RECOMMENDED_REDIS_VERSION = '4.0.0'
+      MIN_REDIS_VERSION = '4.0.0'
+      RECOMMENDED_REDIS_VERSION = '4.0.0' # In future we may deprecate but still support Redis 4
       set_name "Redis version >= #{RECOMMENDED_REDIS_VERSION}?"
 
       @custom_error_message = ''
diff --git a/lib/system_check/sidekiq_check.rb b/lib/system_check/sidekiq_check.rb
index 2f5fc2cea89..4f1533a5b7d 100644
--- a/lib/system_check/sidekiq_check.rb
+++ b/lib/system_check/sidekiq_check.rb
@@ -32,7 +32,7 @@ module SystemCheck
 
     def only_one_sidekiq_running
       process_count = sidekiq_process_count
-      return if process_count.zero?
+      return if process_count == 0
 
       $stdout.print 'Number of Sidekiq processes ... '