diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-10 21:11:08 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-11-10 21:11:08 +0300 |
commit | 4e50b9ed316f3c99693a41274babcd67c63ee640 (patch) | |
tree | 21f0f3a7f73a7dd51b06ba62ad9cfa3eaab85c9f /app/views/projects/pipelines | |
parent | 609943de5e2ee6c3bf0f09d3fb1d5fc38ed5a4ed (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 | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/app/views/projects/pipelines/_info.html.haml b/app/views/projects/pipelines/_info.html.haml index 7c4b0a5fdb9..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!" } @@ -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 + .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 |