diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-28 12:24:19 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-28 12:24:19 +0000 |
| commit | 72cb3bee798655c2d370dfedf3c04665aaa43aa3 (patch) | |
| tree | 4f57c272abd6067ed3dfdf38bca9220b3ea13bf5 /lib | |
| parent | 70c1d0352e39c3c04caaa3082c3ffb4ad5c29b32 (diff) | |
| download | gitlab-ce-72cb3bee798655c2d370dfedf3c04665aaa43aa3.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/project_template.rb | 1 | ||||
| -rw-r--r-- | lib/system_check/app/redis_version_check.rb | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/lib/gitlab/project_template.rb b/lib/gitlab/project_template.rb index 485deb0fb19..c9ed4720e83 100644 --- a/lib/gitlab/project_template.rb +++ b/lib/gitlab/project_template.rb @@ -66,7 +66,6 @@ module Gitlab ProjectTemplate.new('pelican', 'Pages/Pelican', _('Everything you need to create a GitLab Pages site using Pelican'), 'https://gitlab.com/pages/pelican', 'illustrations/third-party-logos/pelican.svg'), ProjectTemplate.new('jekyll', 'Pages/Jekyll', _('Everything you need to create a GitLab Pages site using Jekyll'), 'https://gitlab.com/pages/jekyll', 'illustrations/logos/jekyll.svg'), ProjectTemplate.new('plainhtml', 'Pages/Plain HTML', _('Everything you need to create a GitLab Pages site using plain HTML'), 'https://gitlab.com/pages/plain-html'), - ProjectTemplate.new('gitbook', 'Pages/GitBook', _('Everything you need to create a GitLab Pages site using GitBook'), 'https://gitlab.com/pages/gitbook', 'illustrations/logos/gitbook.svg'), ProjectTemplate.new('hexo', 'Pages/Hexo', _('Everything you need to create a GitLab Pages site using Hexo'), 'https://gitlab.com/pages/hexo', 'illustrations/logos/hexo.svg'), ProjectTemplate.new('middleman', 'Pages/Middleman', _('Everything you need to create a GitLab Pages site using Middleman'), 'https://gitlab.com/gitlab-org/project-templates/middleman', 'illustrations/logos/middleman.svg'), ProjectTemplate.new('gitpod_spring_petclinic', 'Gitpod/Spring Petclinic', _('A Gitpod configured Webapplication in Spring and Java'), 'https://gitlab.com/gitlab-org/project-templates/gitpod-spring-petclinic', 'illustrations/logos/gitpod.svg'), diff --git a/lib/system_check/app/redis_version_check.rb b/lib/system_check/app/redis_version_check.rb index a6ff2405390..d43c7f4a497 100644 --- a/lib/system_check/app/redis_version_check.rb +++ b/lib/system_check/app/redis_version_check.rb @@ -5,9 +5,7 @@ require 'redis' module SystemCheck module App class RedisVersionCheck < SystemCheck::BaseCheck - # Redis 5.x will be deprecated - # https://gitlab.com/gitlab-org/gitlab/-/issues/331468 - MIN_REDIS_VERSION = '5.0.0' + MIN_REDIS_VERSION = '6.0.0' RECOMMENDED_REDIS_VERSION = "6.0.0" set_name "Redis version >= #{RECOMMENDED_REDIS_VERSION}?" |