BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
5194a9d9
Commit
5194a9d9
authored
May 16, 2016
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve the pipeline box
parent
bfc6799c
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
39 additions
and
12 deletions
+39
-12
_commit_box.html.haml
app/views/projects/commit/_commit_box.html.haml
+1
-11
_info.html.haml
app/views/projects/pipelines/_info.html.haml
+37
-0
show.html.haml
app/views/projects/pipelines/show.html.haml
+1
-1
No files found.
app/views/projects/commit/_commit_box.html.haml
View file @
5194a9d9
...
...
@@ -46,17 +46,7 @@
%span
.commit-info.branches
%i
.fa.fa-spinner.fa-spin
-
if
defined?
(
pipeline
)
&&
pipeline
.commit-info-row
Pipeline
=
link_to
namespace_project_pipeline_path
(
@project
.
namespace
,
@project
,
pipeline
),
class:
"ci-status-link ci-status-icon-
#{
pipeline
.
status
}
"
do
=
ci_icon_for_status
(
pipeline
.
status
)
=
ci_label_for_status
(
pipeline
.
status
)
-
if
pipeline
.
duration
in
=
time_interval_in_words
3600
-
elsif
@commit
.
status
-
if
@commit
.
status
.commit-info-row
Builds for
=
pluralize
(
@commit
.
ci_commits
.
count
,
'pipeline'
)
...
...
app/views/projects/pipelines/_info.html.haml
0 → 100644
View file @
5194a9d9
%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
.pull-right
=
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
)
-
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
%h3
.commit-title
=
markdown
escape_once
(
@commit
.
title
),
pipeline: :single_line
-
if
@commit
.
description
.
present?
%pre
.commit-description
=
preserve
(
markdown
(
escape_once
(
@commit
.
description
),
pipeline: :single_line
))
app/views/projects/pipelines/show.html.haml
View file @
5194a9d9
...
...
@@ -3,7 +3,7 @@
=
render
"header_title"
.prepend-top-default
-
if
@commit
=
render
"projects/
commit/commit_box"
,
pipeline:
@pipeline
=
render
"projects/
pipelines/info"
%div
.block-connector
=
render
"projects/commit/ci_commit"
,
ci_commit:
@pipeline
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