Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
09cded29
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 搜索 >>
提交
09cded29
编写于
9月 02, 2016
作者:
K
Katarzyna Kobierska
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Checks if deleting forked project closed all open merge requests
上级
8c77a1fb
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
8 addition
and
6 deletion
+8
-6
app/controllers/projects/merge_requests_controller.rb
app/controllers/projects/merge_requests_controller.rb
+2
-2
app/models/merge_request.rb
app/models/merge_request.rb
+1
-1
spec/controllers/projects_controller_spec.rb
spec/controllers/projects_controller_spec.rb
+5
-3
未找到文件。
app/controllers/projects/merge_requests_controller.rb
浏览文件 @
09cded29
...
...
@@ -429,7 +429,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
def
validates_merge_request
# If source project was removed (Ex. mr from fork to origin)
return
invalid_mr
unless
@merge_request
.
source_project
#
return invalid_mr unless @merge_request.source_project
# Show git not found page
# if there is no saved commits between source & target branch
...
...
@@ -438,7 +438,7 @@ class Projects::MergeRequestsController < Projects::ApplicationController
return
invalid_mr
unless
@merge_request
.
target_branch_exists?
# or if source branch doesn't exist
return
invalid_mr
unless
@merge_request
.
source_branch_exists?
#
return invalid_mr unless @merge_request.source_branch_exists?
end
end
...
...
app/models/merge_request.rb
浏览文件 @
09cded29
...
...
@@ -313,7 +313,7 @@ class MergeRequest < ActiveRecord::Base
end
def
closed_without_fork?
closed?
&&
forked_source_project_missing?
closed?
&&
(
forked_source_project_missing?
||
!
source_project
)
end
def
forked_source_project_missing?
...
...
spec/controllers/projects_controller_spec.rb
浏览文件 @
09cded29
...
...
@@ -192,10 +192,12 @@ describe ProjectsController do
end
it
"closes all related merge requests"
do
fork_project
.
destroy
project
.
merge_requests
<<
merge_request
sign_in
(
admin
)
expect
(
fork_project
.
destroyed?
).
to
be_truthy
expect
(
merge_request
.
state
).
to
eq
(
'closed'
)
delete
:destroy
,
namespace_id:
fork_project
.
namespace
.
path
,
id:
fork_project
.
path
expect
(
merge_request
.
reload
.
state
).
to
eq
(
'closed'
)
end
end
end
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录