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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
ef90fb20
Commit
ef90fb20
authored
Apr 24, 2020
by
Samantha Ming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix incorrect commits number in commits list
parent
b08838c6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
5 deletions
+9
-5
app/views/projects/commits/_commits.html.haml
app/views/projects/commits/_commits.html.haml
+4
-5
changelogs/unreleased/215700-fix-incorrect-commits-number-in-commits-list.yml
...d/215700-fix-incorrect-commits-number-in-commits-list.yml
+5
-0
No files found.
app/views/projects/commits/_commits.html.haml
View file @
ef90fb20
...
...
@@ -4,22 +4,21 @@
-
commits
=
@commits
-
hidden
=
@hidden_commit_count
-
commits_count
=
@commits
.
size
-
commits
.
chunk
{
|
c
|
c
.
committed_date
.
in_time_zone
.
to_date
}.
each
do
|
day
,
commits
|
-
commits
.
chunk
{
|
c
|
c
.
committed_date
.
in_time_zone
.
to_date
}.
each
do
|
day
,
daily_
commits
|
%li
.commit-header.js-commit-header
{
data:
{
day:
day
}
}
%span
.day
=
l
(
day
,
format:
'%d %b, %Y'
)
%span
.commits-count
=
n_
(
"%d commit"
,
"%d commits"
,
commits_count
)
%
commits_count
%span
.commits-count
=
n_
(
"%d commit"
,
"%d commits"
,
daily_commits
.
size
)
%
daily_commits
.
size
%li
.commits-row
{
data:
{
day:
day
}
}
%ul
.content-list.commit-list.flex-list
=
render
partial:
'projects/commits/commit'
,
collection:
commits
,
locals:
{
project:
project
,
ref:
ref
,
merge_request:
merge_request
}
=
render
partial:
'projects/commits/commit'
,
collection:
daily_
commits
,
locals:
{
project:
project
,
ref:
ref
,
merge_request:
merge_request
}
-
if
hidden
>
0
%li
.alert.alert-warning
=
n_
(
'%s additional commit has been omitted to prevent performance issues.'
,
'%s additional commits have been omitted to prevent performance issues.'
,
hidden
)
%
number_with_delimiter
(
hidden
)
-
if
commits
_count
==
0
-
if
commits
.
size
==
0
.mt-4.text-center
.bold
=
_
(
'Your search didn\'t match any commits.'
)
...
...
changelogs/unreleased/215700-fix-incorrect-commits-number-in-commits-list.yml
0 → 100644
View file @
ef90fb20
---
title
:
Fix incorrect commits number in commits list
merge_request
:
30412
author
:
type
:
fixed
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