Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
6bfa3c93
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 搜索 >>
提交
6bfa3c93
编写于
11月 21, 2016
作者:
A
Adam Niedzielski
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Warn that branch does not exist instead of saying that there is
nothing to merge in merge request page
上级
e22514fd
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
32 addition
and
2 deletion
+32
-2
app/views/projects/merge_requests/widget/_open.html.haml
app/views/projects/merge_requests/widget/_open.html.haml
+2
-2
spec/features/merge_requests/deleted_source_branch_spec.rb
spec/features/merge_requests/deleted_source_branch_spec.rb
+30
-0
未找到文件。
app/views/projects/merge_requests/widget/_open.html.haml
浏览文件 @
6bfa3c93
...
...
@@ -9,10 +9,10 @@
-
if
@project
.
archived?
=
render
'projects/merge_requests/widget/open/archived'
-
elsif
@merge_request
.
commits
.
blank?
=
render
'projects/merge_requests/widget/open/nothing'
-
elsif
@merge_request
.
branch_missing?
=
render
'projects/merge_requests/widget/open/missing_branch'
-
elsif
@merge_request
.
commits
.
blank?
=
render
'projects/merge_requests/widget/open/nothing'
-
elsif
@merge_request
.
unchecked?
=
render
'projects/merge_requests/widget/open/check'
-
elsif
@merge_request
.
cannot_be_merged?
&&
!
resolved_conflicts
...
...
spec/features/merge_requests/deleted_source_branch_spec.rb
0 → 100644
浏览文件 @
6bfa3c93
require
'spec_helper'
describe
'Deleted source branch'
,
feature:
true
,
js:
true
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:merge_request
)
{
create
(
:merge_request
)
}
before
do
login_as
user
merge_request
.
project
.
team
<<
[
user
,
:master
]
merge_request
.
update!
(
source_branch:
'this-branch-does-not-exist'
)
visit
namespace_project_merge_request_path
(
merge_request
.
project
.
namespace
,
merge_request
.
project
,
merge_request
)
end
it
'shows a message about missing source branch'
do
expect
(
page
).
to
have_content
(
'Source branch this-branch-does-not-exist does not exist'
)
end
it
'hides Discussion, Commits and Changes tabs'
do
within
'.merge-request-details'
do
expect
(
page
).
to
have_no_content
(
'Discussion'
)
expect
(
page
).
to
have_no_content
(
'Commits'
)
expect
(
page
).
to
have_no_content
(
'Changes'
)
end
end
end
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录