Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
3c04dc20
Commit
3c04dc20
authored
Nov 10, 2016
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rearrange and style items on pipeline page
parent
eb1b5513
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
66 additions
and
68 deletions
+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
No files found.
app/assets/stylesheets/framework/buttons.scss
View file @
3c04dc20
...
@@ -345,6 +345,10 @@
...
@@ -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
)
{
@media
(
max-width
:
$screen-xs-max
)
{
.btn-wide-on-xs
{
.btn-wide-on-xs
{
width
:
100%
;
width
:
100%
;
...
...
app/assets/stylesheets/pages/builds.scss
View file @
3c04dc20
...
@@ -49,10 +49,6 @@
...
@@ -49,10 +49,6 @@
min-height
:
58px
;
min-height
:
58px
;
align-items
:
center
;
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
)
{
@media
(
max-width
:
$screen-sm-max
)
{
padding-right
:
40px
;
padding-right
:
40px
;
...
@@ -63,14 +59,14 @@
...
@@ -63,14 +59,14 @@
.header-content
{
.header-content
{
flex
:
1
;
flex
:
1
;
}
a
{
a
{
color
:
$gl-gray
;
color
:
$gl-gray
;
&
:hover
{
&
:hover
{
color
:
$gl-link-color
;
color
:
$gl-link-color
;
text-decoration
:
none
;
text-decoration
:
none
;
}
}
}
}
}
...
...
app/views/projects/builds/_header.html.haml
View file @
3c04dc20
...
@@ -14,6 +14,6 @@
...
@@ -14,6 +14,6 @@
=
render
"user"
=
render
"user"
=
time_ago_with_tooltip
(
@build
.
created_at
)
=
time_ago_with_tooltip
(
@build
.
created_at
)
-
if
can?
(
current_user
,
:update_build
,
@build
)
&&
@build
.
retryable?
-
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"
}
%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'
)
=
icon
(
'angle-double-left'
)
app/views/projects/commit/_pipeline.html.haml
View file @
3c04dc20
.pipeline-graph-container
.pipeline-graph-container
.row-content-block.build-content.middle-block.pipeline-actions
.oneline.clearfix
.pull-right
-
if
defined?
(
pipeline_details
)
&&
pipeline_details
-
if
can?
(
current_user
,
:update_pipeline
,
pipeline
.
project
)
Pipeline
-
if
pipeline
.
builds
.
latest
.
failed
.
any?
(
&
:retryable?
)
=
link_to
"#
#{
pipeline
.
id
}
"
,
namespace_project_pipeline_path
(
pipeline
.
project
.
namespace
,
pipeline
.
project
,
pipeline
.
id
),
class:
"monospace"
=
link_to
"Retry failed"
,
retry_namespace_project_pipeline_path
(
pipeline
.
project
.
namespace
,
pipeline
.
project
,
pipeline
.
id
),
class:
'btn btn-grouped btn-primary'
,
method: :post
with
=
pluralize
pipeline
.
statuses
.
count
(
:id
),
"build"
-
if
pipeline
.
builds
.
running_or_pending
.
any?
-
if
pipeline
.
ref
=
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
for
=
link_to
pipeline
.
ref
,
namespace_project_commits_path
(
pipeline
.
project
.
namespace
,
pipeline
.
project
,
pipeline
.
ref
),
class:
"monospace"
.oneline.clearfix
-
if
defined?
(
link_to_commit
)
&&
link_to_commit
-
if
defined?
(
pipeline_details
)
&&
pipeline_details
for commit
Pipeline
=
link_to
pipeline
.
short_sha
,
namespace_project_commit_path
(
pipeline
.
project
.
namespace
,
pipeline
.
project
,
pipeline
.
sha
),
class:
"monospace"
=
link_to
"#
#{
pipeline
.
id
}
"
,
namespace_project_pipeline_path
(
pipeline
.
project
.
namespace
,
pipeline
.
project
,
pipeline
.
id
),
class:
"monospace"
-
if
pipeline
.
duration
with
in
=
pluralize
pipeline
.
statuses
.
count
(
:id
),
"build"
=
time_interval_in_words
pipeline
.
duration
-
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
.tabs-holder
%ul
.nav-links.no-top.no-bottom
%ul
.nav-links.no-top.no-bottom
...
...
app/views/projects/pipelines/_info.html.haml
View file @
3c04dc20
%p
.commit-info-row.commit-info-row-header
.commit-info-row
.commit-meta
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
=
link_to
namespace_project_pipeline_path
(
@project
.
namespace
,
@project
,
@pipeline
),
class:
"ci-status ci-
#{
@pipeline
.
status
}
"
do
=
link_to
namespace_project_pipeline_path
(
@project
.
namespace
,
@project
,
@pipeline
),
class:
"ci-status ci-
#{
@pipeline
.
status
}
"
do
=
ci_icon_for_status
(
@pipeline
.
status
)
=
ci_icon_for_status
(
@pipeline
.
status
)
=
ci_label_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
-
if
@commit
.commit-info-row
.commit-box
%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
%h3
.commit-title
%h3
.commit-title
=
markdown
(
@commit
.
title
,
pipeline: :single_line
)
=
markdown
(
@commit
.
title
,
pipeline: :single_line
)
-
if
@commit
.
description
.
present?
-
if
@commit
.
description
.
present?
%pre
.commit-description
%pre
.commit-description
=
preserve
(
markdown
(
@commit
.
description
,
pipeline: :single_line
))
=
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
View file @
3c04dc20
...
@@ -3,9 +3,7 @@
...
@@ -3,9 +3,7 @@
=
render
"projects/pipelines/head"
=
render
"projects/pipelines/head"
%div
{
class:
container_class
}
%div
{
class:
container_class
}
.prepend-top-default
-
if
@commit
-
if
@commit
=
render
"projects/pipelines/info"
=
render
"projects/pipelines/info"
%div
.block-connector
=
render
"projects/commit/pipeline"
,
pipeline:
@pipeline
=
render
"projects/commit/pipeline"
,
pipeline:
@pipeline
changelogs/unreleased/23637-title-bar-pipelines.yml
0 → 100644
View file @
3c04dc20
---
title
:
23637-title-bar-pipelines
merge_request
:
author
:
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment