diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-13 21:08:56 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-13 21:08:56 +0300 |
commit | 7b7bc31c5ba07eebe62e2f2582f111ce24285cd4 (patch) | |
tree | 70c795a932a603e49176d30ee5f0835fcfed46c2 /app/views/projects/pipelines | |
parent | cb38c5062c623059d311c4e9e37428eacdea95d6 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects/pipelines')
-rw-r--r-- | app/views/projects/pipelines/_info.html.haml | 23 | ||||
-rw-r--r-- | app/views/projects/pipelines/_pipeline_stats_text.html.haml | 1 |
2 files changed, 14 insertions, 10 deletions
diff --git a/app/views/projects/pipelines/_info.html.haml b/app/views/projects/pipelines/_info.html.haml index 8f7f0a15e69..7a889570f56 100644 --- a/app/views/projects/pipelines/_info.html.haml +++ b/app/views/projects/pipelines/_info.html.haml @@ -11,17 +11,20 @@ = preserve(markdown(commit.description, pipeline: :single_line)) .info-well - .well-segment.pipeline-info{ class: "gl-align-items-baseline!" } - .icon-container - = sprite_icon('clock', css_class: 'gl-top-0!') - - jobs = n_('%d job', '%d jobs', @pipeline.total_size) % @pipeline.total_size - - if @pipeline.duration - = s_('Pipelines|%{jobs} %{ref_text} in %{duration}').html_safe % { jobs: jobs, ref_text: @pipeline.ref_text, duration: time_interval_in_words(@pipeline.duration) } - - else - = jobs + .well-segment.pipeline-info{ class: "gl-align-items-baseline! gl-flex-direction-column" } + %div + .icon-container + = sprite_icon('clock', css_class: 'gl-top-0!') + = n_('%d job', '%d jobs', @pipeline.total_size) % @pipeline.total_size = @pipeline.ref_text - - if @pipeline.queued_duration - = s_("Pipelines|(queued for %{queued_duration})") % { queued_duration: time_interval_in_words(@pipeline.queued_duration)} + - if @pipeline.finished_at + - duration = time_interval_in_words(@pipeline.duration) + - queued_duration = time_interval_in_words(@pipeline.queued_duration) + %span.gl-pl-7{ 'data-testid': 'pipeline-stats-text' } + - if Feature.enabled?(:refactor_ci_minutes_consumption, @project) + = render_if_exists 'projects/pipelines/pipeline_stats_text', duration: duration, pipeline: @pipeline, queued_duration: queued_duration + - else + = s_("in %{duration} and was queued for %{queued_duration}").html_safe % { duration: duration, queued_duration: queued_duration } - if has_pipeline_badges?(@pipeline) .well-segment diff --git a/app/views/projects/pipelines/_pipeline_stats_text.html.haml b/app/views/projects/pipelines/_pipeline_stats_text.html.haml new file mode 100644 index 00000000000..8adf94e61c4 --- /dev/null +++ b/app/views/projects/pipelines/_pipeline_stats_text.html.haml @@ -0,0 +1 @@ += s_("in %{duration} and was queued for %{queued_duration}").html_safe % { duration: duration, queued_duration: queued_duration } |