diff options
author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2015-09-21 11:46:12 +0200 |
---|---|---|
committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2015-09-21 11:46:12 +0200 |
commit | e0823d189f54ab10244afb8efb8aae22fa2dbbdf (patch) | |
tree | 6cd641cb28c142b46730f892b8085538b2da4767 /lib/ci | |
parent | 25c7467ce1d2146f358ce416a2a41cfd76db5f9a (diff) | |
download | gitlab-ce-e0823d189f54ab10244afb8efb8aae22fa2dbbdf.tar.gz |
Relax CI version check during importci-import-improvements
Diffstat (limited to 'lib/ci')
-rw-r--r-- | lib/ci/migrate/manager.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/ci/migrate/manager.rb b/lib/ci/migrate/manager.rb index 4205809368d..e5e4fb784eb 100644 --- a/lib/ci/migrate/manager.rb +++ b/lib/ci/migrate/manager.rb @@ -1,6 +1,8 @@ module Ci module Migrate class Manager + CI_IMPORT_PREFIX = '8.0' # Only allow imports from CI 8.0.x + def cleanup $progress.print "Deleting tmp directories ... " @@ -48,7 +50,7 @@ module Ci ENV["VERSION"] = "#{settings[:db_version]}" if settings[:db_version].to_i > 0 # restoring mismatching backups can lead to unexpected problems - if settings[:gitlab_version] != GitlabCi::VERSION + if !settings[:gitlab_version].start_with?(CI_IMPORT_PREFIX) puts "GitLab CI version mismatch:".red puts " Your current GitLab CI version (#{GitlabCi::VERSION}) differs from the GitLab CI (#{settings[:gitlab_version]}) version in the backup!".red exit 1 |