Skip to content
GitLab
菜单
为什么选择 GitLab
定价
联系销售
探索
为什么选择 GitLab
定价
联系销售
探索
登录
获取免费试用
主导航
搜索或转到…
项目
GitLab
管理
动态
成员
标记
计划
议题
议题看板
里程碑
迭代
需求
代码
合并请求
仓库
分支
提交
标签
仓库图
比较修订版本
代码片段
锁定的文件
构建
流水线
作业
流水线计划
测试用例
产物
部署
发布
Package registry
容器镜像库
模型注册表
运维
环境
Terraform 模块
监控
事件
服务台
分析
价值流分析
贡献者分析
CI/CD 分析
仓库分析
代码评审分析
议题分析
洞察
模型实验
效能分析
帮助
帮助
支持
GitLab 文档
比较 GitLab 各版本
社区论坛
为极狐GitLab 提交贡献
提交反馈
隐私声明
快捷键
?
新增功能
4
代码片段
群组
项目
显示更多面包屑
gitlab-cn
GitLab
提交
2d8d94a7
提交
2d8d94a7
编辑于
8 years ago
作者:
Katarzyna Kobierska
浏览文件
操作
下载
补丁
差异文件
Change method name
上级
72266311
No related branches found
分支 包含提交
No related tags found
标签 包含提交
无相关合并请求
变更
3
隐藏空白变更内容
行内
左右并排
显示
3 个更改的文件
CHANGELOG
+1
-7
1 个添加, 7 个删除
CHANGELOG
app/models/merge_request.rb
+3
-3
3 个添加, 3 个删除
app/models/merge_request.rb
spec/models/merge_request_spec.rb
+4
-4
4 个添加, 4 个删除
spec/models/merge_request_spec.rb
有
8 个添加
和
14 个删除
CHANGELOG
+
1
−
7
浏览文件 @
2d8d94a7
...
...
@@ -40,6 +40,7 @@ v 8.12.0 (unreleased)
- Use the default branch for displaying the project icon instead of master !5792 (Hannes Rosenögger)
- Adds response mime type to transaction metric action when it's not HTML
- Fix hover leading space bug in pipeline graph !5980
- User can edit closed MR with deleted fork (Katarzyna Kobierska Ula Budziszewska) !5496
v 8.11.3 (unreleased)
- Allow system info page to handle case where info is unavailable
...
...
@@ -53,13 +54,6 @@ v 8.11.2
- Show "Create Merge Request" widget for push events to fork projects on the source project. !5978
- Use gitlab-workhorse 0.7.11 !5983
- Does not halt the GitHub import process when an error occurs. !5763
- User can edit closed MR with deleted fork (Katarzyna Kobierska Ula Budziszewska) !5496
v 8.11.2 (unreleased)
- Show "Create Merge Request" widget for push events to fork projects on the source project
v 8.11.1 (unreleased)
- Does not halt the GitHub import process when an error occurs
- Fix file links on project page when default view is Files !5933
- Fixed enter key in search input not working !5888
...
...
此差异已折叠。
点击以展开。
app/models/merge_request.rb
+
3
−
3
浏览文件 @
2d8d94a7
...
...
@@ -306,17 +306,17 @@ def validate_branches
def
validate_fork
return
true
unless
target_project
&&
source_project
return
true
if
target_project
==
source_project
return
true
unless
fork_missing?
return
true
unless
fork
ed_source_project
_missing?
errors
.
add
:validate_fork
,
'Source project is not a fork of the target project'
end
def
closed_without_fork?
closed?
&&
fork_missing?
closed?
&&
fork
ed_source_project
_missing?
end
def
fork_missing?
def
fork
ed_source_project
_missing?
return
false
unless
for_fork?
return
true
unless
source_project
...
...
此差异已折叠。
点击以展开。
spec/models/merge_request_spec.rb
+
4
−
4
浏览文件 @
2d8d94a7
...
...
@@ -963,7 +963,7 @@ def create_merge_request(source_branch)
end
end
describe
"#fork_missing?"
do
describe
"#fork
ed_source_project
_missing?"
do
let
(
:project
)
{
create
(
:project
)
}
let
(
:fork_project
)
{
create
(
:project
,
forked_from_project:
project
)
}
let
(
:user
)
{
create
(
:user
)
}
...
...
@@ -976,13 +976,13 @@ def create_merge_request(source_branch)
target_project:
project
)
end
it
{
expect
(
merge_request
.
fork_missing?
).
to
be_falsey
}
it
{
expect
(
merge_request
.
fork
ed_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
.
fork_missing?
).
to
be_falsey
}
it
{
expect
(
merge_request
.
fork
ed_source_project
_missing?
).
to
be_falsey
}
end
context
"when the fork does not exist"
do
...
...
@@ -996,7 +996,7 @@ def create_merge_request(source_branch)
unlink_project
.
execute
merge_request
.
reload
expect
(
merge_request
.
fork_missing?
).
to
be_truthy
expect
(
merge_request
.
fork
ed_source_project
_missing?
).
to
be_truthy
end
end
end
...
...
此差异已折叠。
点击以展开。
预览
0%
加载中
请重试
或
添加新附件
.
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
保存评论
取消
想要评论请
注册
或
登录