diff options
author | Robert Speicher <rspeicher@gmail.com> | 2016-11-01 21:14:17 +0300 |
---|---|---|
committer | Robert Speicher <rspeicher@gmail.com> | 2016-11-01 21:22:48 +0300 |
commit | f7091dcd483faa880953f7c133cc5e2bcc326a35 (patch) | |
tree | 28c59ddaa492dfcacdf937dd9ff823fbfd40df86 | |
parent | acd36957097ccd42c0a3d7fd10e7da8e8e468244 (diff) |
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') |