summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2015-09-21 10:33:02 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2015-09-21 10:33:35 +0200
commitee0f1c00b1b07383a1322c7b86440d5f9dd62df1 (patch)
tree6255034983308978cbf1709bc8cfda4b28ad0fa5
parentd2c90d7494e8ca6b37d4ce57b2bc08f8b1175c4b (diff)
downloadgitlab-ce-ee0f1c00b1b07383a1322c7b86440d5f9dd62df1.tar.gz
Use GitlabCi::VERSION when checking migration
-rw-r--r--lib/ci/migrate/manager.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/ci/migrate/manager.rb b/lib/ci/migrate/manager.rb
index 9405397031c..4205809368d 100644
--- a/lib/ci/migrate/manager.rb
+++ b/lib/ci/migrate/manager.rb
@@ -1,8 +1,6 @@
module Ci
module Migrate
class Manager
- VERSION = '8.0.0.pre'
-
def cleanup
$progress.print "Deleting tmp directories ... "
@@ -50,9 +48,9 @@ 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] != VERSION
+ if settings[:gitlab_version] != GitlabCi::VERSION
puts "GitLab CI version mismatch:".red
- puts " Your current GitLab CI version (#{VERSION}) differs from the GitLab CI (#{settings[:gitlab_version]}) version in the backup!".red
+ puts " Your current GitLab CI version (#{GitlabCi::VERSION}) differs from the GitLab CI (#{settings[:gitlab_version]}) version in the backup!".red
exit 1
end
end