Add Pending Tab to Admin Builds
Add Pending Tab to Project Builds Update CHANGELOG
This commit is contained in:
parent
31a5a03c6c
commit
5813aec22d
|
@ -133,6 +133,11 @@ v 8.9.5
|
||||||
- Fixed 'use shortcuts' button on docs. !4979
|
- Fixed 'use shortcuts' button on docs. !4979
|
||||||
- Admin should be able to turn shared runners into specific ones. !4961
|
- Admin should be able to turn shared runners into specific ones. !4961
|
||||||
- Update RedCloth to 4.3.2 for CVE-2012-6684. !4929 (Takuya Noguchi)
|
- Update RedCloth to 4.3.2 for CVE-2012-6684. !4929 (Takuya Noguchi)
|
||||||
|
- Add Pending tab for Builds
|
||||||
|
|
||||||
|
v 8.9.4 (unreleased)
|
||||||
|
- Ensure references to private repos aren't shown to logged-out users
|
||||||
|
v 8.9.5 (unreleased)
|
||||||
- Improve the request / withdraw access button. !4860
|
- Improve the request / withdraw access button. !4860
|
||||||
|
|
||||||
v 8.9.4
|
v 8.9.4
|
||||||
|
|
|
@ -5,8 +5,10 @@ class Admin::BuildsController < Admin::ApplicationController
|
||||||
@builds = @all_builds.order('created_at DESC')
|
@builds = @all_builds.order('created_at DESC')
|
||||||
@builds =
|
@builds =
|
||||||
case @scope
|
case @scope
|
||||||
|
when 'pending'
|
||||||
|
@builds.pending.reverse_order
|
||||||
when 'running'
|
when 'running'
|
||||||
@builds.running_or_pending.reverse_order
|
@builds.running.reverse_order
|
||||||
when 'finished'
|
when 'finished'
|
||||||
@builds.finished
|
@builds.finished
|
||||||
else
|
else
|
||||||
|
|
|
@ -10,8 +10,10 @@ class Projects::BuildsController < Projects::ApplicationController
|
||||||
@builds = @all_builds.order('created_at DESC')
|
@builds = @all_builds.order('created_at DESC')
|
||||||
@builds =
|
@builds =
|
||||||
case @scope
|
case @scope
|
||||||
|
when 'pending'
|
||||||
|
@builds.pending.reverse_order
|
||||||
when 'running'
|
when 'running'
|
||||||
@builds.running_or_pending.reverse_order
|
@builds.running.reverse_order
|
||||||
when 'finished'
|
when 'finished'
|
||||||
@builds.finished
|
@builds.finished
|
||||||
else
|
else
|
||||||
|
|
|
@ -10,10 +10,15 @@
|
||||||
All
|
All
|
||||||
%span.badge.js-totalbuilds-count= @all_builds.count(:id)
|
%span.badge.js-totalbuilds-count= @all_builds.count(:id)
|
||||||
|
|
||||||
|
%li{class: ('active' if @scope == 'pending')}
|
||||||
|
= link_to admin_builds_path(scope: :pending) do
|
||||||
|
Pending
|
||||||
|
%span.badge.js-running-count= number_with_delimiter(@all_builds.pending.count(:id))
|
||||||
|
|
||||||
%li{class: ('active' if @scope == 'running')}
|
%li{class: ('active' if @scope == 'running')}
|
||||||
= link_to admin_builds_path(scope: :running) do
|
= link_to admin_builds_path(scope: :running) do
|
||||||
Running
|
Running
|
||||||
%span.badge.js-running-count= number_with_delimiter(@all_builds.running_or_pending.count(:id))
|
%span.badge.js-running-count= number_with_delimiter(@all_builds.running.count(:id))
|
||||||
|
|
||||||
%li{class: ('active' if @scope == 'finished')}
|
%li{class: ('active' if @scope == 'finished')}
|
||||||
= link_to admin_builds_path(scope: :finished) do
|
= link_to admin_builds_path(scope: :finished) do
|
||||||
|
|
|
@ -11,12 +11,17 @@
|
||||||
%span.badge.js-totalbuilds-count
|
%span.badge.js-totalbuilds-count
|
||||||
= number_with_delimiter(@all_builds.count(:id))
|
= number_with_delimiter(@all_builds.count(:id))
|
||||||
|
|
||||||
|
%li{class: ('active' if @scope == 'pending')}
|
||||||
|
= link_to project_builds_path(@project, scope: :pending) do
|
||||||
|
Pending
|
||||||
|
%span.badge.js-running-count
|
||||||
|
= number_with_delimiter(@all_builds.pending.count(:id))
|
||||||
|
|
||||||
%li{class: ('active' if @scope == 'running')}
|
%li{class: ('active' if @scope == 'running')}
|
||||||
= link_to project_builds_path(@project, scope: :running) do
|
= link_to project_builds_path(@project, scope: :running) do
|
||||||
Running
|
Running
|
||||||
%span.badge.js-running-count
|
%span.badge.js-running-count
|
||||||
= number_with_delimiter(@all_builds.running_or_pending.count(:id))
|
= number_with_delimiter(@all_builds.running.count(:id))
|
||||||
|
|
||||||
%li{class: ('active' if @scope == 'finished')}
|
%li{class: ('active' if @scope == 'finished')}
|
||||||
= link_to project_builds_path(@project, scope: :finished) do
|
= link_to project_builds_path(@project, scope: :finished) do
|
||||||
|
|
Loading…
Reference in New Issue