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
Tatuya Kamada
gitlab-ce
Commits
8f689250
Commit
8f689250
authored
Dec 09, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'rs-delimit-build-counts' into 'master'
Add number_with_delimiter to build counts See merge request !2046
parents
9b327787
98958dec
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
app/views/projects/builds/index.html.haml
app/views/projects/builds/index.html.haml
+6
-3
No files found.
app/views/projects/builds/index.html.haml
View file @
8f689250
...
@@ -12,17 +12,20 @@
...
@@ -12,17 +12,20 @@
%li
{
class:
(
'active'
if
@scope
.
nil?
)}
%li
{
class:
(
'active'
if
@scope
.
nil?
)}
=
link_to
project_builds_path
(
@project
)
do
=
link_to
project_builds_path
(
@project
)
do
Running
Running
%span
.badge.js-running-count
=
@all_builds
.
running_or_pending
.
count
(
:id
)
%span
.badge.js-running-count
=
number_with_delimiter
(
@all_builds
.
running_or_pending
.
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
Finished
Finished
%span
.badge.js-running-count
=
@all_builds
.
finished
.
count
(
:id
)
%span
.badge.js-running-count
=
number_with_delimiter
(
@all_builds
.
finished
.
count
(
:id
))
%li
{
class:
(
'active'
if
@scope
==
'all'
)}
%li
{
class:
(
'active'
if
@scope
==
'all'
)}
=
link_to
project_builds_path
(
@project
,
scope: :all
)
do
=
link_to
project_builds_path
(
@project
,
scope: :all
)
do
All
All
%span
.badge.js-totalbuilds-count
=
@all_builds
.
count
(
:id
)
%span
.badge.js-totalbuilds-count
=
number_with_delimiter
(
@all_builds
.
count
(
:id
))
.gray-content-block
.gray-content-block
#{
(
@scope
||
'running'
).
capitalize
}
builds from this project
#{
(
@scope
||
'running'
).
capitalize
}
builds from this project
...
...
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