Skip to content
Snippets Groups Projects
Commit ab5fb49e authored by GitLab Bot's avatar GitLab Bot
Browse files

Automatic merge of gitlab-org/omnibus-gitlab master

parents bd69f457 4f097b29
No related branches found
No related tags found
1 merge request!98Merged upstream up to the bump of rubygems version.
......@@ -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=15.0
MIN_VERSION=15.11
if [ -n "${OLD_VERSION_STRING}" ] ; then
# Checking
......
......@@ -112,7 +112,7 @@
then
GITLAB_UPGRADE='true'
new_version=$(awk '/^gitlab-(ce|ee|jh)/ {print $NF}' /opt/gitlab/version-manifest.txt)
MIN_VERSION="15.0" gitlab-ctl upgrade-check "${old_version}" "${new_version}"
MIN_VERSION="15.11" gitlab-ctl upgrade-check "${old_version}" "${new_version}"
fi
# Copy gitlab.rb for the first time
......
module GitlabCtl
class UpgradeCheck
MIN_VERSION = ENV['MIN_VERSION'] || '15.0'.freeze
MIN_VERSION = ENV['MIN_VERSION'] || '15.11'.freeze
class <<self
def valid?(ov, nv)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment