Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
5813aec2
Commit
5813aec2
authored
Jul 05, 2016
by
Katarzyna Kobierska
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add Pending Tab to Admin Builds
Add Pending Tab to Project Builds Update CHANGELOG
parent
31a5a03c
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
4 deletions
+23
-4
CHANGELOG
CHANGELOG
+5
-0
app/controllers/admin/builds_controller.rb
app/controllers/admin/builds_controller.rb
+3
-1
app/controllers/projects/builds_controller.rb
app/controllers/projects/builds_controller.rb
+3
-1
app/views/admin/builds/index.html.haml
app/views/admin/builds/index.html.haml
+6
-1
app/views/projects/builds/index.html.haml
app/views/projects/builds/index.html.haml
+6
-1
No files found.
CHANGELOG
View file @
5813aec2
...
@@ -133,6 +133,11 @@ v 8.9.5
...
@@ -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
...
...
app/controllers/admin/builds_controller.rb
View file @
5813aec2
...
@@ -5,8 +5,10 @@ class Admin::BuildsController < Admin::ApplicationController
...
@@ -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
...
...
app/controllers/projects/builds_controller.rb
View file @
5813aec2
...
@@ -10,8 +10,10 @@ class Projects::BuildsController < Projects::ApplicationController
...
@@ -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
...
...
app/views/admin/builds/index.html.haml
View file @
5813aec2
...
@@ -10,10 +10,15 @@
...
@@ -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
...
...
app/views/projects/builds/index.html.haml
View file @
5813aec2
...
@@ -11,12 +11,17 @@
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment