diff options
| author | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-10-24 11:47:29 +0300 |
|---|---|---|
| committer | Grzegorz Bizon <grzegorz@gitlab.com> | 2017-10-24 11:47:29 +0300 |
| commit | 4aaf4774a7af3614ac67149bcdef6c9b5ae5c2cd (patch) | |
| tree | 4f3af4ae8b5c032776b9d9bf436b98b9e423f423 | |
| parent | 7444e8a1342e0b3e361b6973754eb3da20130e49 (diff) | |
| parent | 188e860804285f6d54140df54d8fa62a15f99dc9 (diff) | |
Merge branch 'hide-pipeline-zero-duration' into 'master'
Hides pipeline duration in commit box when it is zero (nil)
Closes #32788
See merge request gitlab-org/gitlab-ce!14979
| -rw-r--r-- | app/views/projects/commit/_commit_box.html.haml | 5 | ||||
| -rw-r--r-- | changelogs/unreleased/hide-pipeline-zero-duration.yml | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/app/views/projects/commit/_commit_box.html.haml b/app/views/projects/commit/_commit_box.html.haml index 09bcd187e59..ff17372fdd9 100644 --- a/app/views/projects/commit/_commit_box.html.haml +++ b/app/views/projects/commit/_commit_box.html.haml @@ -77,5 +77,6 @@ #{ n_(s_('Pipeline|with stage'), s_('Pipeline|with stages'), last_pipeline.stages_count) } .mr-widget-pipeline-graph = render 'shared/mini_pipeline_graph', pipeline: last_pipeline, klass: 'js-commit-pipeline-graph' - in - = time_interval_in_words last_pipeline.duration + - if last_pipeline.duration + in + = time_interval_in_words last_pipeline.duration diff --git a/changelogs/unreleased/hide-pipeline-zero-duration.yml b/changelogs/unreleased/hide-pipeline-zero-duration.yml new file mode 100644 index 00000000000..5d7a0983537 --- /dev/null +++ b/changelogs/unreleased/hide-pipeline-zero-duration.yml @@ -0,0 +1,5 @@ +--- +title: Hides pipeline duration in commit box when it is zero (nil) +merge_request: 14979 +author: gvieira37 +type: fixed |