Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
ecefe090
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,发现更多精彩内容 >>
未验证
提交
ecefe090
编写于
8月 31, 2018
作者:
F
Filipa Lacerda
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Render link to branch only when branch still exists
上级
472f2d56
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
27 addition
and
1 deletion
+27
-1
app/views/projects/pipelines/_info.html.haml
app/views/projects/pipelines/_info.html.haml
+5
-1
changelogs/unreleased/42611-removed-branch-link.yml
changelogs/unreleased/42611-removed-branch-link.yml
+5
-0
spec/features/projects/pipelines/pipeline_spec.rb
spec/features/projects/pipelines/pipeline_spec.rb
+17
-0
未找到文件。
app/views/projects/pipelines/_info.html.haml
浏览文件 @
ecefe090
...
...
@@ -13,7 +13,11 @@
=
pluralize
@pipeline
.
total_size
,
"job"
-
if
@pipeline
.
ref
from
=
link_to
@pipeline
.
ref
,
project_ref_path
(
@project
,
@pipeline
.
ref
),
class:
"ref-name"
-
if
@project
.
repository
.
branch_exists?
(
@pipeline
.
ref
)
=
link_to
@pipeline
.
ref
,
project_ref_path
(
@project
,
@pipeline
.
ref
),
class:
"ref-name"
-
else
%span
.ref-name
=
@pipeline
.
ref
-
if
@pipeline
.
duration
in
=
time_interval_in_words
(
@pipeline
.
duration
)
...
...
changelogs/unreleased/42611-removed-branch-link.yml
0 → 100644
浏览文件 @
ecefe090
---
title
:
Only render link to branch when branch still exists in pipeline page
merge_request
:
author
:
type
:
fixed
spec/features/projects/pipelines/pipeline_spec.rb
浏览文件 @
ecefe090
...
...
@@ -63,6 +63,11 @@ describe 'Pipeline', :js do
expect
(
page
).
to
have_css
(
'#js-tab-pipeline.active'
)
end
it
'shows link to the pipeline ref'
do
expect
(
page
).
to
have_link
(
pipeline
.
ref
)
end
it_behaves_like
'showing user status'
do
let
(
:user_with_status
)
{
pipeline
.
user
}
...
...
@@ -208,6 +213,18 @@ describe 'Pipeline', :js do
it
{
expect
(
page
).
not_to
have_content
(
'Cancel running'
)
}
end
end
context
'with deleted branch'
do
before
do
DeleteBranchService
.
new
(
@project
,
@user
).
execute
(
pipeline
.
ref
)
end
it
'does not render link to the pipeline ref'
do
expect
(
page
).
not_to
have_link
(
pipeline
.
ref
)
expect
(
page
).
to
have_content
(
pipeline
.
ref
)
end
end
end
context
'when user does not have access to read jobs'
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录