Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
3c04dc20
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 搜索 >>
提交
3c04dc20
编写于
11月 10, 2016
作者:
A
Annabel Dunstone Gray
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Rearrange and style items on pipeline page
上级
eb1b5513
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
66 addition
and
68 deletion
+66
-68
app/assets/stylesheets/framework/buttons.scss
app/assets/stylesheets/framework/buttons.scss
+4
-0
app/assets/stylesheets/pages/builds.scss
app/assets/stylesheets/pages/builds.scss
+6
-10
app/views/projects/builds/_header.html.haml
app/views/projects/builds/_header.html.haml
+1
-1
app/views/projects/commit/_pipeline.html.haml
app/views/projects/commit/_pipeline.html.haml
+15
-24
app/views/projects/pipelines/_info.html.haml
app/views/projects/pipelines/_info.html.haml
+34
-29
app/views/projects/pipelines/show.html.haml
app/views/projects/pipelines/show.html.haml
+2
-4
changelogs/unreleased/23637-title-bar-pipelines.yml
changelogs/unreleased/23637-title-bar-pipelines.yml
+4
-0
未找到文件。
app/assets/stylesheets/framework/buttons.scss
浏览文件 @
3c04dc20
...
...
@@ -345,6 +345,10 @@
}
}
.retry-build-btn
{
@include
btn-outline
(
$white-light
,
$blue-normal
,
$blue-normal
,
$blue-light
,
$white-light
,
$blue-light
);
}
@media
(
max-width
:
$screen-xs-max
)
{
.btn-wide-on-xs
{
width
:
100%
;
...
...
app/assets/stylesheets/pages/builds.scss
浏览文件 @
3c04dc20
...
...
@@ -49,10 +49,6 @@
min-height
:
58px
;
align-items
:
center
;
.btn-inverted
{
@include
btn-outline
(
$white-light
,
$blue-normal
,
$blue-normal
,
$blue-light
,
$white-light
,
$blue-light
);
}
@media
(
max-width
:
$screen-sm-max
)
{
padding-right
:
40px
;
...
...
@@ -63,14 +59,14 @@
.header-content
{
flex
:
1
;
}
a
{
color
:
$gl-gray
;
a
{
color
:
$gl-gray
;
&
:hover
{
color
:
$gl-link-color
;
text-decoration
:
none
;
&
:hover
{
color
:
$gl-link-color
;
text-decoration
:
none
;
}
}
}
...
...
app/views/projects/builds/_header.html.haml
浏览文件 @
3c04dc20
...
...
@@ -14,6 +14,6 @@
=
render
"user"
=
time_ago_with_tooltip
(
@build
.
created_at
)
-
if
can?
(
current_user
,
:update_build
,
@build
)
&&
@build
.
retryable?
=
link_to
"Retry build"
,
retry_namespace_project_build_path
(
@project
.
namespace
,
@project
,
@build
),
class:
'btn
btn-inverted
pull-right'
,
method: :post
=
link_to
"Retry build"
,
retry_namespace_project_build_path
(
@project
.
namespace
,
@project
,
@build
),
class:
'btn
retry-build-btn
pull-right'
,
method: :post
%button
.btn.btn-default.pull-right.visible-xs-block.visible-sm-block.build-gutter-toggle.js-sidebar-build-toggle
{
role:
"button"
,
type:
"button"
}
=
icon
(
'angle-double-left'
)
app/views/projects/commit/_pipeline.html.haml
浏览文件 @
3c04dc20
.pipeline-graph-container
.row-content-block.build-content.middle-block.pipeline-actions
.pull-right
-
if
can?
(
current_user
,
:update_pipeline
,
pipeline
.
project
)
-
if
pipeline
.
builds
.
latest
.
failed
.
any?
(
&
:retryable?
)
=
link_to
"Retry failed"
,
retry_namespace_project_pipeline_path
(
pipeline
.
project
.
namespace
,
pipeline
.
project
,
pipeline
.
id
),
class:
'btn btn-grouped btn-primary'
,
method: :post
-
if
pipeline
.
builds
.
running_or_pending
.
any?
=
link_to
"Cancel running"
,
cancel_namespace_project_pipeline_path
(
pipeline
.
project
.
namespace
,
pipeline
.
project
,
pipeline
.
id
),
data:
{
confirm:
'Are you sure?'
},
class:
'btn btn-grouped btn-danger'
,
method: :post
.oneline.clearfix
-
if
defined?
(
pipeline_details
)
&&
pipeline_details
Pipeline
=
link_to
"#
#{
pipeline
.
id
}
"
,
namespace_project_pipeline_path
(
pipeline
.
project
.
namespace
,
pipeline
.
project
,
pipeline
.
id
),
class:
"monospace"
with
=
pluralize
pipeline
.
statuses
.
count
(
:id
),
"build"
-
if
pipeline
.
ref
for
=
link_to
pipeline
.
ref
,
namespace_project_commits_path
(
pipeline
.
project
.
namespace
,
pipeline
.
project
,
pipeline
.
ref
),
class:
"monospace"
-
if
defined?
(
link_to_commit
)
&&
link_to_commit
for commit
=
link_to
pipeline
.
short_sha
,
namespace_project_commit_path
(
pipeline
.
project
.
namespace
,
pipeline
.
project
,
pipeline
.
sha
),
class:
"monospace"
-
if
pipeline
.
duration
in
=
time_interval_in_words
pipeline
.
duration
.oneline.clearfix
-
if
defined?
(
pipeline_details
)
&&
pipeline_details
Pipeline
=
link_to
"#
#{
pipeline
.
id
}
"
,
namespace_project_pipeline_path
(
pipeline
.
project
.
namespace
,
pipeline
.
project
,
pipeline
.
id
),
class:
"monospace"
with
=
pluralize
pipeline
.
statuses
.
count
(
:id
),
"build"
-
if
pipeline
.
ref
for
=
link_to
pipeline
.
ref
,
namespace_project_commits_path
(
pipeline
.
project
.
namespace
,
pipeline
.
project
,
pipeline
.
ref
),
class:
"monospace"
-
if
defined?
(
link_to_commit
)
&&
link_to_commit
for commit
=
link_to
pipeline
.
short_sha
,
namespace_project_commit_path
(
pipeline
.
project
.
namespace
,
pipeline
.
project
,
pipeline
.
sha
),
class:
"monospace"
-
if
pipeline
.
duration
in
=
time_interval_in_words
pipeline
.
duration
.tabs-holder
%ul
.nav-links.no-top.no-bottom
...
...
app/views/projects/pipelines/_info.html.haml
浏览文件 @
3c04dc20
%p
.commit-info-row
Pipeline
=
link_to
"#
#{
@pipeline
.
id
}
"
,
namespace_project_pipeline_path
(
@project
.
namespace
,
@project
,
@pipeline
.
id
),
class:
"monospace"
with
=
pluralize
@pipeline
.
statuses
.
count
(
:id
),
"build"
-
if
@pipeline
.
ref
for
=
link_to
@pipeline
.
ref
,
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
@pipeline
.
ref
),
class:
"monospace"
-
if
@pipeline
.
duration
in
=
time_interval_in_words
(
@pipeline
.
duration
)
-
if
@pipeline
.
queued_duration
=
"(queued for
#{
time_interval_in_words
(
@pipeline
.
queued_duration
)
}
)"
.pull-right
.commit-info-row.commit-info-row-header
.commit-meta
=
link_to
namespace_project_pipeline_path
(
@project
.
namespace
,
@project
,
@pipeline
),
class:
"ci-status ci-
#{
@pipeline
.
status
}
"
do
=
ci_icon_for_status
(
@pipeline
.
status
)
=
ci_label_for_status
(
@pipeline
.
status
)
%strong
Pipeline ##{@commit.pipelines.last.id}
triggered
#{
time_ago_with_tooltip
(
@commit
.
authored_date
)
}
by
=
author_avatar
(
@commit
,
size:
24
)
=
commit_author_link
(
@commit
)
.commit-action-buttons
-
if
can?
(
current_user
,
:update_pipeline
,
@pipeline
.
project
)
-
if
@pipeline
.
builds
.
latest
.
failed
.
any?
(
&
:retryable?
)
=
link_to
"Retry failed"
,
retry_namespace_project_pipeline_path
(
@pipeline
.
project
.
namespace
,
@pipeline
.
project
,
@pipeline
.
id
),
class:
'btn btn-grouped retry-build-btn'
,
method: :post
-
if
@pipeline
.
builds
.
running_or_pending
.
any?
=
link_to
"Cancel running"
,
cancel_namespace_project_pipeline_path
(
@pipeline
.
project
.
namespace
,
@pipeline
.
project
,
@pipeline
.
id
),
data:
{
confirm:
'Are you sure?'
},
class:
'btn btn-grouped btn-danger'
,
method: :post
-
if
@commit
.commit-info-row
%span
.light
Authored by
%strong
=
commit_author_link
(
@commit
,
avatar:
true
,
size:
24
)
#{
time_ago_with_tooltip
(
@commit
.
authored_date
)
}
.commit-info-row
%span
.light
Commit
=
link_to
@pipeline
.
sha
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
@pipeline
.
sha
),
class:
"monospace"
=
clipboard_button
(
clipboard_text:
@pipeline
.
sha
)
-
if
@commit
.commit-box.content-block
.commit-box
%h3
.commit-title
=
markdown
(
@commit
.
title
,
pipeline: :single_line
)
-
if
@commit
.
description
.
present?
%pre
.commit-description
=
preserve
(
markdown
(
@commit
.
description
,
pipeline: :single_line
))
.info-well
-
if
@commit
.
status
.well-segment.pipeline-info
.icon-container
=
ci_icon_for_status
(
@commit
.
status
)
=
pluralize
@pipeline
.
statuses
.
count
(
:id
),
"build"
-
if
@pipeline
.
ref
for
=
link_to
@pipeline
.
ref
,
namespace_project_commits_path
(
@project
.
namespace
,
@project
,
@pipeline
.
ref
),
class:
"monospace"
-
if
@pipeline
.
duration
in
=
time_interval_in_words
(
@pipeline
.
duration
)
-
if
@pipeline
.
queued_duration
=
"(queued for
#{
time_interval_in_words
(
@pipeline
.
queued_duration
)
}
)"
.well-segment.branch-info
.icon-container.commit-icon
=
custom_icon
(
"icon_commit"
)
=
link_to
@pipeline
.
sha
,
namespace_project_commit_path
(
@project
.
namespace
,
@project
,
@pipeline
.
sha
),
class:
"monospace"
=
clipboard_button
(
clipboard_text:
@pipeline
.
sha
)
app/views/projects/pipelines/show.html.haml
浏览文件 @
3c04dc20
...
...
@@ -3,9 +3,7 @@
=
render
"projects/pipelines/head"
%div
{
class:
container_class
}
.prepend-top-default
-
if
@commit
=
render
"projects/pipelines/info"
%div
.block-connector
-
if
@commit
=
render
"projects/pipelines/info"
=
render
"projects/commit/pipeline"
,
pipeline:
@pipeline
changelogs/unreleased/23637-title-bar-pipelines.yml
0 → 100644
浏览文件 @
3c04dc20
---
title
:
23637-title-bar-pipelines
merge_request
:
author
:
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录