Commit 8cb9b376 authored by Filipa Lacerda's avatar Filipa Lacerda

Fixes invalid html - table was inside an ul and had 2 tbody tags

Adds hidden-xs class to the all column instead of the div inside it in order to remove extra whitespace when the actions are hidden

Fixes columns width in pipeplines table

Changes table parent element to not be an ul and reduces column width for the Build column

Adds entry to CHANGELOG

Removes added width for build table.

Adds the CHANGELOG entry in the middle to avoid more conflicts with master
parent 5bc1e93c
...@@ -37,6 +37,7 @@ v 8.13.0 (unreleased) ...@@ -37,6 +37,7 @@ v 8.13.0 (unreleased)
- API: expose pipeline data in builds API (!6502, Guilherme Salazar) - API: expose pipeline data in builds API (!6502, Guilherme Salazar)
- Notify the Merger about merge after successful build (Dimitris Karakasilis) - Notify the Merger about merge after successful build (Dimitris Karakasilis)
- Fix broken repository 500 errors in project list - Fix broken repository 500 errors in project list
- Fix Pipeline list commit column width should be adjusted
- Close todos when accepting merge requests via the API !6486 (tonygambone) - Close todos when accepting merge requests via the API !6486 (tonygambone)
v 8.12.4 (unreleased) v 8.12.4 (unreleased)
......
...@@ -39,6 +39,10 @@ ...@@ -39,6 +39,10 @@
overflow: auto; overflow: auto;
} }
.pipelines .table.builds .branch-commit {
width: 33%;
}
.table.builds { .table.builds {
min-width: 900px; min-width: 900px;
...@@ -77,7 +81,7 @@ ...@@ -77,7 +81,7 @@
} }
.branch-commit { .branch-commit {
.branch-name { .branch-name {
font-weight: bold; font-weight: bold;
max-width: 150px; max-width: 150px;
......
- admin = local_assigns.fetch(:admin, false) - admin = local_assigns.fetch(:admin, false)
- if builds.blank? - if builds.blank?
%li %div
.nothing-here-block No builds to show .nothing-here-block No builds to show
- else - else
.table-holder .table-holder
......
...@@ -19,5 +19,5 @@ ...@@ -19,5 +19,5 @@
= link_to ci_lint_path, class: 'btn btn-default' do = link_to ci_lint_path, class: 'btn btn-default' do
%span CI Lint %span CI Lint
%ul.content-list.builds-content-list %div.content-list.builds-content-list
= render "table", builds: @builds, project: @project = render "table", builds: @builds, project: @project
...@@ -13,45 +13,44 @@ ...@@ -13,45 +13,44 @@
- else - else
= ci_status_with_icon(build.status) = ci_status_with_icon(build.status)
%td %td.branch-commit
.branch-commit - if can?(current_user, :read_build, build)
- if can?(current_user, :read_build, build) = link_to namespace_project_build_url(build.project.namespace, build.project, build) do
= link_to namespace_project_build_url(build.project.namespace, build.project, build) do
%span.build-link ##{build.id}
- else
%span.build-link ##{build.id} %span.build-link ##{build.id}
- else
%span.build-link ##{build.id}
- if ref - if ref
- if build.ref - if build.ref
.icon-container
= build.tag? ? icon('tag') : icon('code-fork')
= link_to build.ref, namespace_project_commits_path(build.project.namespace, build.project, build.ref), class: "monospace branch-name"
- else
.light none
.icon-container .icon-container
= custom_icon("icon_commit") = build.tag? ? icon('tag') : icon('code-fork')
= link_to build.ref, namespace_project_commits_path(build.project.namespace, build.project, build.ref), class: "monospace branch-name"
- else
.light none
.icon-container
= custom_icon("icon_commit")
- if commit_sha - if commit_sha
= link_to build.short_sha, namespace_project_commit_path(build.project.namespace, build.project, build.sha), class: "commit-id monospace" = link_to build.short_sha, namespace_project_commit_path(build.project.namespace, build.project, build.sha), class: "commit-id monospace"
- if build.stuck? - if build.stuck?
= icon('warning', class: 'text-warning has-tooltip', title: 'Build is stuck. Check runners.') = icon('warning', class: 'text-warning has-tooltip', title: 'Build is stuck. Check runners.')
- if retried - if retried
= icon('warning', class: 'text-warning has-tooltip', title: 'Build was retried.') = icon('warning', class: 'text-warning has-tooltip', title: 'Build was retried.')
.label-container .label-container
- if build.tags.any? - if build.tags.any?
- build.tags.each do |tag| - build.tags.each do |tag|
%span.label.label-primary %span.label.label-primary
= tag = tag
- if build.try(:trigger_request) - if build.try(:trigger_request)
%span.label.label-info triggered %span.label.label-info triggered
- if build.try(:allow_failure) - if build.try(:allow_failure)
%span.label.label-danger allowed to fail %span.label.label-danger allowed to fail
- if retried - if retried
%span.label.label-warning retried %span.label.label-warning retried
- if build.manual? - if build.manual?
%span.label.label-info manual %span.label.label-info manual
- if admin - if admin
%td %td
......
...@@ -9,33 +9,32 @@ ...@@ -9,33 +9,32 @@
= ci_icon_for_status(status) = ci_icon_for_status(status)
- else - else
= ci_status_with_icon(status) = ci_status_with_icon(status)
%td %td.branch-commit
.branch-commit = link_to namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id) do
= link_to namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id) do %span ##{pipeline.id}
%span ##{pipeline.id} - if pipeline.ref && show_branch
- if pipeline.ref && show_branch .icon-container
.icon-container = pipeline.tag? ? icon('tag') : icon('code-fork')
= pipeline.tag? ? icon('tag') : icon('code-fork') = link_to pipeline.ref, namespace_project_commits_path(pipeline.project.namespace, pipeline.project, pipeline.ref), class: "monospace branch-name"
= link_to pipeline.ref, namespace_project_commits_path(pipeline.project.namespace, pipeline.project, pipeline.ref), class: "monospace branch-name" - if show_commit
- if show_commit .icon-container
.icon-container = custom_icon("icon_commit")
= custom_icon("icon_commit") = link_to pipeline.short_sha, namespace_project_commit_path(pipeline.project.namespace, pipeline.project, pipeline.sha), class: "commit-id monospace"
= link_to pipeline.short_sha, namespace_project_commit_path(pipeline.project.namespace, pipeline.project, pipeline.sha), class: "commit-id monospace" - if pipeline.latest?
- if pipeline.latest? %span.label.label-success.has-tooltip{ title: 'Latest build for this branch' } latest
%span.label.label-success.has-tooltip{ title: 'Latest build for this branch' } latest - if pipeline.triggered?
- if pipeline.triggered? %span.label.label-primary triggered
%span.label.label-primary triggered - if pipeline.yaml_errors.present?
- if pipeline.yaml_errors.present? %span.label.label-danger.has-tooltip{ title: "#{pipeline.yaml_errors}" } yaml invalid
%span.label.label-danger.has-tooltip{ title: "#{pipeline.yaml_errors}" } yaml invalid - if pipeline.builds.any?(&:stuck?)
- if pipeline.builds.any?(&:stuck?) %span.label.label-warning stuck
%span.label.label-warning stuck
%p.commit-title %p.commit-title
- if commit = pipeline.commit - if commit = pipeline.commit
= author_avatar(commit, size: 20) = author_avatar(commit, size: 20)
= link_to_gfm truncate(commit.title, length: 60), namespace_project_commit_path(pipeline.project.namespace, pipeline.project, commit.id), class: "commit-row-message" = link_to_gfm truncate(commit.title, length: 60), namespace_project_commit_path(pipeline.project.namespace, pipeline.project, commit.id), class: "commit-row-message"
- else - else
Cant find HEAD commit for this branch Cant find HEAD commit for this branch
- stages_status = pipeline.statuses.relevant.latest.stages_status - stages_status = pipeline.statuses.relevant.latest.stages_status
...@@ -58,8 +57,8 @@ ...@@ -58,8 +57,8 @@
= icon("calendar") = icon("calendar")
#{time_ago_with_tooltip(pipeline.finished_at, short_format: false, skip_js: true)} #{time_ago_with_tooltip(pipeline.finished_at, short_format: false, skip_js: true)}
%td.pipeline-actions %td.pipeline-actions.hidden-xs
.controls.hidden-xs.pull-right .controls.pull-right
- artifacts = pipeline.builds.latest.with_artifacts_not_expired - artifacts = pipeline.builds.latest.with_artifacts_not_expired
- actions = pipeline.manual_actions - actions = pipeline.manual_actions
- if artifacts.present? || actions.any? - if artifacts.present? || actions.any?
......
...@@ -36,20 +36,20 @@ ...@@ -36,20 +36,20 @@
= link_to ci_lint_path, class: 'btn btn-default' do = link_to ci_lint_path, class: 'btn btn-default' do
%span CI Lint %span CI Lint
%ul.content-list.pipelines %div.content-list.pipelines
- stages = @pipelines.stages - stages = @pipelines.stages
- if @pipelines.blank? - if @pipelines.blank?
%li %div
.nothing-here-block No pipelines to show .nothing-here-block No pipelines to show
- else - else
.table-holder .table-holder
%table.table.builds %table.table.builds
%tbody %thead
%th Status %th.col-xs-1.col-sm-1 Status
%th Pipeline %th.col-xs-2.col-sm-4 Pipeline
%th Stages %th.col-xs-2.col-sm-2 Stages
%th %th.col-xs-2.col-sm-2.commit-message
%th %th.hidden-xs.col-sm-3
= render @pipelines, commit_sha: true, stage: true, allow_retry: true, stages: stages = render @pipelines, commit_sha: true, stage: true, allow_retry: true, stages: stages
= paginate @pipelines, theme: 'gitlab' = paginate @pipelines, theme: 'gitlab'
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment