Commit f7091dcd authored by Robert Speicher's avatar Robert Speicher

Restore previous behavior for `VersionChecker#different_version?`

parent acd36957
...@@ -25,14 +25,14 @@ module Gitlab ...@@ -25,14 +25,14 @@ module Gitlab
def verify_version!(version) def verify_version!(version)
if different_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 else
true true
end end
end end
def different_version?(version) 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 rescue => e
Rails.logger.error("Import/Export error: #{e.message}") Rails.logger.error("Import/Export error: #{e.message}")
raise Gitlab::ImportExport::Error.new('Incorrect VERSION format') raise Gitlab::ImportExport::Error.new('Incorrect VERSION format')
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment