Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
f7091dcd
Commit
f7091dcd
authored
Nov 01, 2016
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Restore previous behavior for `VersionChecker#different_version?`
parent
acd36957
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
lib/gitlab/import_export/version_checker.rb
lib/gitlab/import_export/version_checker.rb
+2
-2
No files found.
lib/gitlab/import_export/version_checker.rb
View file @
f7091dcd
...
@@ -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'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment