diff --git a/config/templates/package-scripts/preinst.erb b/config/templates/package-scripts/preinst.erb index f746dc532172db8c610db1ba50e287c869af8f6d_Y29uZmlnL3RlbXBsYXRlcy9wYWNrYWdlLXNjcmlwdHMvcHJlaW5zdC5lcmI=..fc04a30adceb5f25b3867e7d0d96246cf60f9525_Y29uZmlnL3RlbXBsYXRlcy9wYWNrYWdlLXNjcmlwdHMvcHJlaW5zdC5lcmI= 100644 --- a/config/templates/package-scripts/preinst.erb +++ b/config/templates/package-scripts/preinst.erb @@ -40,7 +40,7 @@ upgrade_check() { # Minimum version from which jumps are permitted to current version. # Follows https://docs.gitlab.com/ee/update/index.html#upgrade-paths - MIN_VERSION=14.10 + MIN_VERSION=15.0 if [ -n "${OLD_VERSION_STRING}" ] ; then # Checking diff --git a/docker/assets/wrapper b/docker/assets/wrapper index f746dc532172db8c610db1ba50e287c869af8f6d_ZG9ja2VyL2Fzc2V0cy93cmFwcGVy..fc04a30adceb5f25b3867e7d0d96246cf60f9525_ZG9ja2VyL2Fzc2V0cy93cmFwcGVy 100755 --- a/docker/assets/wrapper +++ b/docker/assets/wrapper @@ -112,7 +112,7 @@ then GITLAB_UPGRADE='true' new_version=$(awk '/^gitlab-(ce|ee|jh)/ {print $NF}' /opt/gitlab/version-manifest.txt) - MIN_VERSION="14.10" gitlab-ctl upgrade-check "${old_version}" "${new_version}" + MIN_VERSION="15.0" gitlab-ctl upgrade-check "${old_version}" "${new_version}" fi # Copy gitlab.rb for the first time diff --git a/files/gitlab-ctl-commands/lib/gitlab_ctl/upgrade_check.rb b/files/gitlab-ctl-commands/lib/gitlab_ctl/upgrade_check.rb index f746dc532172db8c610db1ba50e287c869af8f6d_ZmlsZXMvZ2l0bGFiLWN0bC1jb21tYW5kcy9saWIvZ2l0bGFiX2N0bC91cGdyYWRlX2NoZWNrLnJi..fc04a30adceb5f25b3867e7d0d96246cf60f9525_ZmlsZXMvZ2l0bGFiLWN0bC1jb21tYW5kcy9saWIvZ2l0bGFiX2N0bC91cGdyYWRlX2NoZWNrLnJi 100644 --- a/files/gitlab-ctl-commands/lib/gitlab_ctl/upgrade_check.rb +++ b/files/gitlab-ctl-commands/lib/gitlab_ctl/upgrade_check.rb @@ -1,6 +1,6 @@ module GitlabCtl class UpgradeCheck - MIN_VERSION = ENV['MIN_VERSION'] || '14.10'.freeze + MIN_VERSION = ENV['MIN_VERSION'] || '15.0'.freeze class <<self def valid?(ov, nv)