diff options
Diffstat (limited to 'app/views/projects/pipelines')
-rw-r--r-- | app/views/projects/pipelines/_info.html.haml | 75 | ||||
-rw-r--r-- | app/views/projects/pipelines/show.html.haml | 8 |
2 files changed, 1 insertions, 82 deletions
diff --git a/app/views/projects/pipelines/_info.html.haml b/app/views/projects/pipelines/_info.html.haml deleted file mode 100644 index 753bb77e755..00000000000 --- a/app/views/projects/pipelines/_info.html.haml +++ /dev/null @@ -1,75 +0,0 @@ -- if @pipeline.name - .gl-border-t.gl-p-5.gl-px-0 - %h3.gl-m-0.gl-text-body - = @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! 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_legacy - - 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' } - = render_if_exists 'projects/pipelines/pipeline_stats_text', duration: duration, pipeline: @pipeline, queued_duration: queued_duration - - - if has_pipeline_badges?(@pipeline) - .well-segment - .icon-container - = sprite_icon('flag', css_class: 'gl-top-0!') - - if @pipeline.schedule? - = gl_badge_tag _('Scheduled'), { variant: :info, size: :sm }, { class: 'js-pipeline-url-scheduled', title: _('This pipeline was triggered by a schedule.') } - - if @pipeline.child? - - text = sprintf(s_('Pipelines|Child pipeline (%{link_start}parent%{link_end})'), { link_start: "<a href='#{pipeline_path(@pipeline.triggered_by_pipeline)}' class='text-underline'>", link_end: "</a>"}).html_safe - = gl_badge_tag text, { variant: :info, size: :sm }, { class: 'js-pipeline-child has-tooltip', title: s_("Pipelines|This is a child pipeline within the parent pipeline") } - - if @pipeline.latest? - = gl_badge_tag s_('Pipelines|latest'), { variant: :success, size: :sm }, { class: 'js-pipeline-url-latest has-tooltip', title: _("Latest pipeline for the most recent commit on this branch") } - - if @pipeline.merge_train_pipeline? - = gl_badge_tag s_('Pipelines|merge train'), { variant: :info, size: :sm }, { class: 'js-pipeline-url-train has-tooltip', title: s_("Pipelines|This pipeline ran on the contents of this merge request combined with the contents of all other merge requests queued for merging into the target branch.") } - - if @pipeline.has_yaml_errors? - = gl_badge_tag s_('Pipelines|yaml invalid'), { variant: :danger, size: :sm }, { class: 'js-pipeline-url-yaml has-tooltip', title: @pipeline.yaml_errors } - - if @pipeline.failure_reason? - = gl_badge_tag s_('Pipelines|error'), { variant: :danger, size: :sm }, { class: 'js-pipeline-url-failure has-tooltip', title: @pipeline.failure_reason } - - if @pipeline.auto_devops_source? - - popover_title_text = html_escape(_('This pipeline makes use of a predefined CI/CD configuration enabled by %{b_open}Auto DevOps.%{b_close}')) % { b_open: '<b>'.html_safe, b_close: '</b>'.html_safe } - - popover_content_url = help_page_path('topics/autodevops/index.md') - - popover_content_text = _('Learn more about Auto DevOps') - = gl_badge_tag s_('Pipelines|Auto DevOps'), { variant: :info, size: :sm }, { class: 'js-pipeline-url-autodevops', href: "#", tabindex: "0", role: "button", data: { container: 'body', toggle: 'popover', placement: 'top', html: 'true', triggers: 'focus', title: "<div class='gl-font-weight-normal gl-line-height-normal'>#{popover_title_text}</div>", content: "<a href='#{popover_content_url}' target='_blank' rel='noopener noreferrer nofollow'>#{popover_content_text}</a>" } } - - if @pipeline.detached_merge_request_pipeline? - = gl_badge_tag s_('Pipelines|merge request'), { variant: :info, size: :sm }, { class: 'js-pipeline-url-mergerequest has-tooltip', data: { qa_selector: 'merge_request_badge_tag' }, title: s_("Pipelines|This pipeline ran on the contents of this merge request's source branch, not the target branch.") } - - if @pipeline.stuck? - = gl_badge_tag s_('Pipelines|stuck'), { variant: :warning, size: :sm }, { class: 'js-pipeline-url-stuck has-tooltip' } - - .well-segment{ 'data-testid': 'commit-row' } - .icon-container.commit-icon - = sprite_icon('commit', css_class: 'gl-top-0!') - - if @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 - = sprite_icon("git-merge", css_class: 'gl-top-0!') - %span.related-merge-requests - %span.js-truncated-mr-list - = @pipeline.all_related_merge_request_text(limit: 1) - - if @pipeline.has_many_merge_requests? - = link_to("#", class: "js-toggle-mr-list") do - %span.text-expander - = sprite_icon('ellipsis_h', size: 12) - %span.js-full-mr-list.hide - = @pipeline.all_related_merge_request_text diff --git a/app/views/projects/pipelines/show.html.haml b/app/views/projects/pipelines/show.html.haml index 46e1cd07a17..bdf09e5356f 100644 --- a/app/views/projects/pipelines/show.html.haml +++ b/app/views/projects/pipelines/show.html.haml @@ -9,16 +9,10 @@ - add_page_startup_graphql_call('pipelines/get_pipeline_details', { projectPath: @project.full_path, iid: @pipeline.iid }) .js-pipeline-container{ data: { controller_action: "#{controller.action_name}" } } - - if Feature.enabled?(:pipeline_details_header_vue, @project) - #js-pipeline-details-header-vue{ data: js_pipeline_details_header_data(@project, @pipeline) } - - else - #js-pipeline-header-vue.pipeline-header-container{ data: { full_path: @project.full_path, graphql_resource_etag: graphql_etag_pipeline_path(@pipeline), pipeline_iid: @pipeline.iid, pipeline_id: @pipeline.id, pipelines_path: project_pipelines_path(@project) } } + #js-pipeline-details-header-vue{ data: js_pipeline_details_header_data(@project, @pipeline) } = render_if_exists 'projects/pipelines/cc_validation_required_alert', pipeline: @pipeline - - if @pipeline.commit.present? && !Feature.enabled?(:pipeline_details_header_vue, @project) - = render "projects/pipelines/info", commit: @pipeline.commit - - if pipeline_has_errors = render Pajamas::AlertComponent.new(title: s_('Pipelines|Unable to create pipeline'), variant: :danger, |