Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
f87eb250
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
f87eb250
编写于
8月 03, 2016
作者:
J
James Lopez
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix Import/Export error checking versions
上级
e63729d9
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
34 addition
and
1 deletion
+34
-1
CHANGELOG
CHANGELOG
+3
-0
lib/gitlab/import_export/version_checker.rb
lib/gitlab/import_export/version_checker.rb
+1
-1
spec/lib/gitlab/import_export/version_checker_spec.rb
spec/lib/gitlab/import_export/version_checker_spec.rb
+30
-0
未找到文件。
CHANGELOG
浏览文件 @
f87eb250
...
...
@@ -56,6 +56,9 @@ v 8.11.0 (unreleased)
- Fix RequestProfiler::Middleware error when code is reloaded in development
- Catch what warden might throw when profiling requests to re-throw it
v 8.10.4 (unreleased)
- Fix Import/Export error checking versions
v 8.10.3
- Fix Import/Export issue importing milestones and labels not associated properly. !5426
- Fix timing problems running imports on production. !5523
...
...
lib/gitlab/import_export/version_checker.rb
浏览文件 @
f87eb250
...
...
@@ -25,7 +25,7 @@ module Gitlab
def
verify_version!
(
version
)
if
Gem
::
Version
.
new
(
version
)
>
Gem
::
Version
.
new
(
Gitlab
::
ImportExport
.
version
)
raise
Gitlab
::
ImportExport
::
Error
(
"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
...
...
spec/lib/gitlab/import_export/version_checker_spec.rb
0 → 100644
浏览文件 @
f87eb250
require
'spec_helper'
describe
Gitlab
::
ImportExport
::
VersionChecker
,
services:
true
do
describe
'bundle a project Git repo'
do
let
(
:shared
)
{
Gitlab
::
ImportExport
::
Shared
.
new
(
relative_path:
''
)
}
let
(
:version
)
{
Gitlab
::
ImportExport
.
version
}
before
do
allow
(
File
).
to
receive
(
:open
).
and_return
(
version
)
end
it
'returns true if Import/Export have the same version'
do
expect
(
described_class
.
check!
(
shared:
shared
)).
to
be
true
end
context
'newer version'
do
let
(
:version
)
{
'900.0'
}
it
'returns false if export version is newer'
do
expect
(
described_class
.
check!
(
shared:
shared
)).
to
be
false
end
it
'shows the correct error message'
do
described_class
.
check!
(
shared:
shared
)
expect
(
shared
.
errors
.
first
).
to
eq
(
"Import version mismatch: Required <=
#{
Gitlab
::
ImportExport
.
version
}
but was
#{
version
}
"
)
end
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录