diff options
author | Robert Speicher <rspeicher@gmail.com> | 2016-11-01 18:14:17 +0000 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-11-01 18:22:01 +0000 |
commit | 8b1e42455603f4a16b4ebc176e49bb422e04649f (patch) | |
tree | 16f30ecb3725b110613e1a5a7e2c7d1b52810562 | |
parent | e7cb86ed8c01b0b31efaff285565b1377b504343 (diff) | |
download | gitlab-ce-8b1e42455603f4a16b4ebc176e49bb422e04649f.tar.gz |
Restore previous behavior for `VersionChecker#different_version?`
-rw-r--r-- | lib/gitlab/import_export/version_checker.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/import_export/version_checker.rb b/lib/gitlab/import_export/version_checker.rb index bd3c3ee3b2f..05e7fa2b04a 100644 --- a/lib/gitlab/import_export/version_checker.rb +++ b/lib/gitlab/import_export/version_checker.rb @@ -25,14 +25,14 @@ module Gitlab def verify_version!(version) if different_version?(version) - raise Gitlab::ImportExport::Error.new("Import version mismatch: Required #{Gitlab::ImportExport.version} but was #{version}") + raise Gitlab::ImportExport::Error.new("Import version mismatch: Required <= #{Gitlab::ImportExport.version} but was #{version}") else true end end def different_version?(version) - Gem::Version.new(version) != Gem::Version.new(Gitlab::ImportExport.version) + Gem::Version.new(version) > Gem::Version.new(Gitlab::ImportExport.version) rescue => e Rails.logger.error("Import/Export error: #{e.message}") raise Gitlab::ImportExport::Error.new('Incorrect VERSION format') |