Merge branch '22509-pipeline-tables' into 'master'
Fixes Pipeline list commit column width should be adjusted ## What does this MR do? - Fixes some HTML problems - Pipeline and Build tables were inside an `ul` tag - Pipeline table had 2 `tbody` tags and no `thead` - Adds grid classes in Pipeline table in order to be responsive: The content of the last column was being hidden but the column it self was not which results in a lot of blank space - Adds a percentage width to the commit column in the Pipeline table. - Removes one level of nesting in the commit column in the Pipeline table and to the Build column in the Build table. ## Are there points in the code the reviewer needs to double check? No ## Why was this MR needed? The commit column had to much white space. ## Screenshots (if relevant) ![pipelines](/uploads/d198f07dceb498cc7ec537842cd34fff/pipelines.png) ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22509 See merge request !6595
This commit is contained in:
commit
219413c5d1
7 changed files with 76 additions and 72 deletions
|
@ -50,6 +50,7 @@ v 8.13.0 (unreleased)
|
|||
- Notify the Merger about merge after successful build (Dimitris Karakasilis)
|
||||
- Reduce queries needed to find users using their SSH keys when pushing commits
|
||||
- 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)
|
||||
- Changed Slack service user referencing from full name to username (Sebastian Poxhofer)
|
||||
- Add Container Registry on/off status to Admin Area !6638 (the-undefined)
|
||||
|
|
|
@ -22,6 +22,11 @@
|
|||
|
||||
.table.builds {
|
||||
min-width: 1200px;
|
||||
|
||||
.branch-commit {
|
||||
width: 33%;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
- admin = local_assigns.fetch(:admin, false)
|
||||
|
||||
- if builds.blank?
|
||||
%li
|
||||
%div
|
||||
.nothing-here-block No builds to show
|
||||
- else
|
||||
.table-holder
|
||||
|
|
|
@ -19,5 +19,5 @@
|
|||
= link_to ci_lint_path, class: 'btn btn-default' do
|
||||
%span CI Lint
|
||||
|
||||
%ul.content-list.builds-content-list
|
||||
%div.content-list.builds-content-list
|
||||
= render "table", builds: @builds, project: @project
|
||||
|
|
|
@ -13,8 +13,7 @@
|
|||
- else
|
||||
= ci_status_with_icon(build.status)
|
||||
|
||||
%td
|
||||
.branch-commit
|
||||
%td.branch-commit
|
||||
- if can?(current_user, :read_build, build)
|
||||
= link_to namespace_project_build_url(build.project.namespace, build.project, build) do
|
||||
%span.build-link ##{build.id}
|
||||
|
|
|
@ -9,8 +9,7 @@
|
|||
= ci_icon_for_status(status)
|
||||
- else
|
||||
= ci_status_with_icon(status)
|
||||
%td
|
||||
.branch-commit
|
||||
%td.branch-commit
|
||||
= link_to namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id) do
|
||||
%span ##{pipeline.id}
|
||||
- if pipeline.ref && show_branch
|
||||
|
@ -58,8 +57,8 @@
|
|||
= icon("calendar")
|
||||
#{time_ago_with_tooltip(pipeline.finished_at, short_format: false, skip_js: true)}
|
||||
|
||||
%td.pipeline-actions
|
||||
.controls.hidden-xs.pull-right
|
||||
%td.pipeline-actions.hidden-xs
|
||||
.controls.pull-right
|
||||
- artifacts = pipeline.builds.latest.with_artifacts_not_expired
|
||||
- actions = pipeline.manual_actions
|
||||
- if artifacts.present? || actions.any?
|
||||
|
|
|
@ -36,20 +36,20 @@
|
|||
= link_to ci_lint_path, class: 'btn btn-default' do
|
||||
%span CI Lint
|
||||
|
||||
%ul.content-list.pipelines
|
||||
%div.content-list.pipelines
|
||||
- stages = @pipelines.stages
|
||||
- if @pipelines.blank?
|
||||
%li
|
||||
%div
|
||||
.nothing-here-block No pipelines to show
|
||||
- else
|
||||
.table-holder
|
||||
%table.table.builds
|
||||
%tbody
|
||||
%th Status
|
||||
%th Pipeline
|
||||
%th Stages
|
||||
%th
|
||||
%th
|
||||
%thead
|
||||
%th.col-xs-1.col-sm-1 Status
|
||||
%th.col-xs-2.col-sm-4 Pipeline
|
||||
%th.col-xs-2.col-sm-2 Stages
|
||||
%th.col-xs-2.col-sm-2
|
||||
%th.hidden-xs.col-sm-3
|
||||
= render @pipelines, commit_sha: true, stage: true, allow_retry: true, stages: stages
|
||||
|
||||
= paginate @pipelines, theme: 'gitlab'
|
||||
|
|
Loading…
Reference in a new issue