diff options
| author | Robert Speicher <robert@gitlab.com> | 2016-08-19 17:42:26 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2016-08-19 17:42:26 +0000 |
| commit | eae636edb4f01c7f8902856ca95fce7c8453a541 (patch) | |
| tree | 1ff705c222b5ed6974e7cd4e3e15eb81041d9386 /app/views | |
| parent | 66eb01853a15cf517341e91fdd10f6384fec80de (diff) | |
| parent | c627dbc8fbf6f759dc9b40d75fa6fc9a435a461f (diff) | |
| download | gitlab-ce-eae636edb4f01c7f8902856ca95fce7c8453a541.tar.gz | |
Merge branch 'wall-clock-time-for-showing-pipeline' into 'master'
Show wall-clock time when showing pipeline
## What does this MR do?
Show wall-clock time when showing pipeline instead of cumulative builds time.
Closes #17007
See merge request !5734
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/admin/builds/_build.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/ci/builds/_build.html.haml | 2 | ||||
| -rw-r--r-- | app/views/projects/ci/pipelines/_pipeline.html.haml | 4 | ||||
| -rw-r--r-- | app/views/projects/commit/_commit_box.html.haml | 5 | ||||
| -rw-r--r-- | app/views/projects/pipelines/_info.html.haml | 2 |
5 files changed, 7 insertions, 8 deletions
diff --git a/app/views/admin/builds/_build.html.haml b/app/views/admin/builds/_build.html.haml index 352adbedee4..f29d9c94441 100644 --- a/app/views/admin/builds/_build.html.haml +++ b/app/views/admin/builds/_build.html.haml @@ -51,7 +51,7 @@ - if build.duration %p.duration = custom_icon("icon_timer") - = duration_in_numbers(build.finished_at, build.started_at) + = duration_in_numbers(build.duration) - if build.finished_at %p.finished-at diff --git a/app/views/projects/ci/builds/_build.html.haml b/app/views/projects/ci/builds/_build.html.haml index 91081435220..1fdf32466f2 100644 --- a/app/views/projects/ci/builds/_build.html.haml +++ b/app/views/projects/ci/builds/_build.html.haml @@ -63,7 +63,7 @@ - if build.duration %p.duration = custom_icon("icon_timer") - = duration_in_numbers(build.finished_at, build.started_at) + = duration_in_numbers(build.duration) - if build.finished_at %p.finished-at = icon("calendar") diff --git a/app/views/projects/ci/pipelines/_pipeline.html.haml b/app/views/projects/ci/pipelines/_pipeline.html.haml index be387201f8d..9a672b23341 100644 --- a/app/views/projects/ci/pipelines/_pipeline.html.haml +++ b/app/views/projects/ci/pipelines/_pipeline.html.haml @@ -48,10 +48,10 @@ \- %td - - if pipeline.started_at && pipeline.finished_at + - if pipeline.duration %p.duration = custom_icon("icon_timer") - = duration_in_numbers(pipeline.finished_at, pipeline.started_at) + = duration_in_numbers(pipeline.duration) - if pipeline.finished_at %p.finished-at = icon("calendar") diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml index 14adee7a6e9..29d767e7769 100644 --- a/app/views/projects/commit/_commit_box.html.haml +++ b/app/views/projects/commit/_commit_box.html.haml @@ -58,9 +58,8 @@ = ci_icon_for_status(@commit.status) %span.ci-status-label = ci_label_for_status(@commit.status) - - if @commit.pipelines.duration - in - = time_interval_in_words @commit.pipelines.duration + in + = time_interval_in_words @commit.pipelines.total_duration .commit-box.content-block %h3.commit-title diff --git a/app/views/projects/pipelines/_info.html.haml b/app/views/projects/pipelines/_info.html.haml index 8289aefcde7..063e83a407a 100644 --- a/app/views/projects/pipelines/_info.html.haml +++ b/app/views/projects/pipelines/_info.html.haml @@ -9,7 +9,7 @@ = 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 + = 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 |