Improve the pipeline box
This commit is contained in:
parent
bfc6799c93
commit
5194a9d9f6
|
@ -46,17 +46,7 @@
|
||||||
%span.commit-info.branches
|
%span.commit-info.branches
|
||||||
%i.fa.fa-spinner.fa-spin
|
%i.fa.fa-spinner.fa-spin
|
||||||
|
|
||||||
- if defined?(pipeline) && pipeline
|
- if @commit.status
|
||||||
.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
|
|
||||||
.commit-info-row
|
.commit-info-row
|
||||||
Builds for
|
Builds for
|
||||||
= pluralize(@commit.ci_commits.count, 'pipeline')
|
= pluralize(@commit.ci_commits.count, 'pipeline')
|
||||||
|
|
|
@ -0,0 +1,37 @@
|
||||||
|
%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))
|
|
@ -3,7 +3,7 @@
|
||||||
= render "header_title"
|
= render "header_title"
|
||||||
.prepend-top-default
|
.prepend-top-default
|
||||||
- if @commit
|
- if @commit
|
||||||
= render "projects/commit/commit_box", pipeline: @pipeline
|
= render "projects/pipelines/info"
|
||||||
%div.block-connector
|
%div.block-connector
|
||||||
|
|
||||||
= render "projects/commit/ci_commit", ci_commit: @pipeline
|
= render "projects/commit/ci_commit", ci_commit: @pipeline
|
||||||
|
|
Loading…
Reference in New Issue