Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
6df06ded
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,发现更多精彩内容 >>
提交
6df06ded
编写于
10月 15, 2015
作者:
K
Kamil Trzciński
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'build-view-ui-fixes' into 'master'
Build View UI fixes See merge request !1608
上级
19cfa86a
567460d1
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
7 addition
and
6 deletion
+7
-6
app/helpers/runners_helper.rb
app/helpers/runners_helper.rb
+1
-1
app/views/projects/builds/_build.html.haml
app/views/projects/builds/_build.html.haml
+3
-0
app/views/projects/builds/show.html.haml
app/views/projects/builds/show.html.haml
+3
-5
未找到文件。
app/helpers/runners_helper.rb
浏览文件 @
6df06ded
...
...
@@ -15,7 +15,7 @@ module RunnersHelper
end
def
runner_link
(
runner
)
display_name
=
truncate
(
runner
.
display_name
,
length:
20
)
display_name
=
truncate
(
runner
.
display_name
,
length:
15
)
id
=
"
\#
#{
runner
.
id
}
"
if
current_user
&&
current_user
.
admin
...
...
app/views/projects/builds/_build.html.haml
浏览文件 @
6df06ded
...
...
@@ -9,6 +9,9 @@
-
else
%strong
Build ##{build.id}
-
if
build
.
show_warning?
%i
.fa.fa-warning.text-warning
%td
=
link_to
build
.
short_sha
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
build
.
sha
)
...
...
app/views/projects/builds/show.html.haml
浏览文件 @
6df06ded
...
...
@@ -44,16 +44,14 @@
.bs-callout.bs-callout-warning
%p
-
if
no_runners_for_project?
(
@build
.
project
)
This build is stuck, because the project doesn't have
runners assigned
.
This build is stuck, because the project doesn't have
any runners online assigned to it
.
-
elsif
@build
.
tags
.
any?
This build is stuck.
%br
This build is stuck, because you don't have any active runners online with these tags assigned to the project:
This build is stuck, because you don't have any active runners online with any of these tags assigned to them:
-
@build
.
tags
.
each
do
|
tag
|
%span
.label.label-primary
=
tag
-
else
This build is stuck, because you don't have any active runners
online
that can run this build.
This build is stuck, because you don't have any active runners that can run this build.
%br
Go to
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录