Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
61536ed2
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,发现更多精彩内容 >>
提交
61536ed2
编写于
10月 19, 2016
作者:
N
Nick Thomas
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rename forked_source_project_missing? to source_project_missing?
上级
6f846fcb
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
7 addition
and
7 deletion
+7
-7
app/models/merge_request.rb
app/models/merge_request.rb
+3
-3
spec/models/merge_request_spec.rb
spec/models/merge_request_spec.rb
+4
-4
未找到文件。
app/models/merge_request.rb
浏览文件 @
61536ed2
...
...
@@ -326,17 +326,17 @@ class MergeRequest < ActiveRecord::Base
def
validate_fork
return
true
unless
target_project
&&
source_project
return
true
if
target_project
==
source_project
return
true
unless
forked_
source_project_missing?
return
true
unless
source_project_missing?
errors
.
add
:validate_fork
,
'Source project is not a fork of the target project'
end
def
closed_without_fork?
closed?
&&
forked_
source_project_missing?
closed?
&&
source_project_missing?
end
def
forked_
source_project_missing?
def
source_project_missing?
return
false
unless
for_fork?
return
true
unless
source_project
...
...
spec/models/merge_request_spec.rb
浏览文件 @
61536ed2
...
...
@@ -1198,7 +1198,7 @@ describe MergeRequest, models: true do
end
end
describe
"#
forked_
source_project_missing?"
do
describe
"#source_project_missing?"
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:fork_project
)
{
create
(
:project
,
forked_from_project:
project
)
}
let
(
:user
)
{
create
(
:user
)
}
...
...
@@ -1211,13 +1211,13 @@ describe MergeRequest, models: true do
target_project:
project
)
end
it
{
expect
(
merge_request
.
forked_
source_project_missing?
).
to
be_falsey
}
it
{
expect
(
merge_request
.
source_project_missing?
).
to
be_falsey
}
end
context
"when the source project is the same as the target project"
do
let
(
:merge_request
)
{
create
(
:merge_request
,
source_project:
project
)
}
it
{
expect
(
merge_request
.
forked_
source_project_missing?
).
to
be_falsey
}
it
{
expect
(
merge_request
.
source_project_missing?
).
to
be_falsey
}
end
context
"when the fork does not exist"
do
...
...
@@ -1231,7 +1231,7 @@ describe MergeRequest, models: true do
unlink_project
.
execute
merge_request
.
reload
expect
(
merge_request
.
forked_
source_project_missing?
).
to
be_truthy
expect
(
merge_request
.
source_project_missing?
).
to
be_truthy
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录