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:23:10 +0000 |
commit | 9a058557fc6f6e552354cd9d58c900c76109639d (patch) | |
tree | 63ba318e08deba53da87c5a4aac325c41e0a3d5b | |
parent | 5460f848d1dab60dc630ff179f9845beeec07dba (diff) | |
download | gitlab-ce-8-9-stable.tar.gz |
Restore previous behavior for `VersionChecker#different_version?`8-9-stable
-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 a34c00e0cc2..97f2b525834 100644 --- a/lib/gitlab/import_export/version_checker.rb +++ b/lib/gitlab/import_export/version_checker.rb @@ -26,14 +26,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') |