diff options
author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-10-13 22:35:40 +0300 |
---|---|---|
committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2016-10-18 16:29:29 +0300 |
commit | 87222e27e30e45024c2d930650a876e4447d3708 (patch) | |
tree | 4621be7625e2502a9e7a0a5e0f125b028380fceb | |
parent | aa5aa273855054a2b3dcdbb5e4cd4177c98ec022 (diff) |
show all builds in sidebar, including retried
-rw-r--r-- | app/assets/stylesheets/pages/builds.scss | 4 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/pipelines.scss | 2 | ||||
-rw-r--r-- | app/views/projects/builds/_sidebar.html.haml | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/app/assets/stylesheets/pages/builds.scss b/app/assets/stylesheets/pages/builds.scss index 2793282c1cb..d6a55fbd464 100644 --- a/app/assets/stylesheets/pages/builds.scss +++ b/app/assets/stylesheets/pages/builds.scss @@ -195,7 +195,7 @@ .build-job { position: relative; - .fa-check { + .fa-arrow-right { position: absolute; left: 15px; top: 20px; @@ -205,7 +205,7 @@ &.active { font-weight: bold; - .fa { + .fa-arrow-right { display: block; } } diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss index c79b29743ee..75aa44b6cea 100644 --- a/app/assets/stylesheets/pages/pipelines.scss +++ b/app/assets/stylesheets/pages/pipelines.scss @@ -114,7 +114,7 @@ .fa { font-size: 12px; color: $gl-text-color; - margin-left: 3px; + margin-left: 5px; } .commit-id { diff --git a/app/views/projects/builds/_sidebar.html.haml b/app/views/projects/builds/_sidebar.html.haml index 687b93916b0..5ec214a31d0 100644 --- a/app/views/projects/builds/_sidebar.html.haml +++ b/app/views/projects/builds/_sidebar.html.haml @@ -1,4 +1,4 @@ -- builds = @build.pipeline.builds.latest.to_a +- builds = @build.pipeline.builds.to_a - statuses = ["failed", "pending", "running", "canceled", "success", "skipped"] %aside.right-sidebar.right-sidebar-expanded.build-sidebar.js-build-sidebar @@ -126,7 +126,7 @@ .builds-container - statuses.each do |build_status| - builds.select{|build| build.status == build_status}.each do |build| - .build-job{class: ('active' if build == @build; 'retried' if @build.retried?), data: {stage: build.stage}} + .build-job{class: ('active' if build == @build; 'retried' if build.retried?), data: {stage: build.stage}} = link_to namespace_project_build_path(@project.namespace, @project, build) do = icon('arrow-right') = ci_icon_for_status(build.status) @@ -135,5 +135,5 @@ = build.name - else = build.id - - if @build.retried? + - if build.retried? %i.fa.fa-refresh.has-tooltip{data: { container: 'body', placement: 'bottom' }, title: 'This build was retried'} |