diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 14:33:21 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-17 14:33:21 +0300 |
commit | 7021455bd1ed7b125c55eb1b33c5a01f2bc55ee0 (patch) | |
tree | 5bdc2229f5198d516781f8d24eace62fc7e589e9 /app/views/projects/pipelines | |
parent | 185b095e93520f96e9cfc31d9c3e69b498cdab7c (diff) |
Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42
Diffstat (limited to 'app/views/projects/pipelines')
-rw-r--r-- | app/views/projects/pipelines/_info.html.haml | 29 | ||||
-rw-r--r-- | app/views/projects/pipelines/show.html.haml | 2 |
2 files changed, 20 insertions, 11 deletions
diff --git a/app/views/projects/pipelines/_info.html.haml b/app/views/projects/pipelines/_info.html.haml index 2e403358e2e..30cc7f94311 100644 --- a/app/views/projects/pipelines/_info.html.haml +++ b/app/views/projects/pipelines/_info.html.haml @@ -1,9 +1,13 @@ -.commit-box - %h3.commit-title - = markdown(commit.title, pipeline: :single_line) - - if commit.description.present? - %pre.commit-description< - = preserve(markdown(commit.description, pipeline: :single_line)) +- if Feature.enabled?(:pipeline_name, @pipeline.project) && @pipeline.name + %h3 + = @pipeline.name +- else + .commit-box + %h3.commit-title + = markdown(commit.title, pipeline: :single_line) + - if commit.description.present? + %pre.commit-description< + = preserve(markdown(commit.description, pipeline: :single_line)) .info-well .well-segment.pipeline-info{ class: "gl-align-items-baseline!" } @@ -19,7 +23,7 @@ = s_("Pipelines|(queued for %{queued_duration})") % { queued_duration: time_interval_in_words(@pipeline.queued_duration)} - if has_pipeline_badges?(@pipeline) - .well-segment.qa-pipeline-badges + .well-segment .icon-container = sprite_icon('flag', css_class: 'gl-top-0!') - if @pipeline.schedule? @@ -45,11 +49,16 @@ - if @pipeline.stuck? = gl_badge_tag s_('Pipelines|stuck'), { variant: :warning, size: :sm }, { class: 'js-pipeline-url-stuck has-tooltip' } - .well-segment.branch-info + .well-segment{ 'data-testid': 'commit-row' } .icon-container.commit-icon = sprite_icon('commit', css_class: 'gl-top-0!') - = link_to commit.short_id, project_commit_path(@project, @pipeline.sha), class: "commit-sha" - = clipboard_button(text: @pipeline.sha, title: _("Copy commit SHA")) + - if Feature.enabled?(:pipeline_name, @pipeline.project) && @pipeline.name + = markdown(commit.title, pipeline: :single_line) + = clipboard_button(text: @pipeline.sha, title: _("Copy commit SHA")) + = link_to commit.short_id, project_commit_path(@project, @pipeline.sha), class: "commit-sha" + - else + = link_to commit.short_id, project_commit_path(@project, @pipeline.sha), class: "commit-sha" + = clipboard_button(text: @pipeline.sha, title: _("Copy commit SHA")) .well-segment.related-merge-request-info .icon-container diff --git a/app/views/projects/pipelines/show.html.haml b/app/views/projects/pipelines/show.html.haml index c9eb2e92193..4531bb2d0a9 100644 --- a/app/views/projects/pipelines/show.html.haml +++ b/app/views/projects/pipelines/show.html.haml @@ -30,4 +30,4 @@ #js-pipeline-tabs{ data: js_pipeline_tabs_data(@project, @pipeline, @current_user) } - else = render "projects/pipelines/with_tabs", pipeline: @pipeline, stages: @stages, pipeline_has_errors: pipeline_has_errors -.js-pipeline-details-vue{ data: { metrics_path: namespace_project_ci_prometheus_metrics_histograms_path(namespace_id: @project.namespace, project_id: @project, format: :json), pipeline_project_path: @project.full_path, pipeline_iid: @pipeline.iid, graphql_resource_etag: graphql_etag_pipeline_path(@pipeline) } } +.js-pipeline-details-vue{ data: { metrics_path: namespace_project_ci_prometheus_metrics_histograms_path(namespace_id: @project.namespace, project_id: @project, format: :json), pipeline_project_path: @project.full_path, pipeline_iid: @pipeline.iid, graphql_resource_etag: graphql_etag_pipeline_path(@pipeline), pipeline_path: pipeline_path(@pipeline) } } |