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
dc4ceed1
Commit
dc4ceed1
authored
Feb 20, 2020
by
Pavel Shutsin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add commit stats limit indicator
We should be explicit about 2000 commits limit at branch graphs page
parent
22f6af08
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
1 deletion
+11
-1
app/controllers/projects/graphs_controller.rb
app/controllers/projects/graphs_controller.rb
+2
-1
app/views/projects/graphs/charts.html.haml
app/views/projects/graphs/charts.html.haml
+1
-0
changelogs/unreleased/28627-adjust-commit-stats-over-limit-indication.yml
...eased/28627-adjust-commit-stats-over-limit-indication.yml
+5
-0
locale/gitlab.pot
locale/gitlab.pot
+3
-0
No files found.
app/controllers/projects/graphs_controller.rb
View file @
dc4ceed1
...
...
@@ -37,7 +37,8 @@ class Projects::GraphsController < Projects::ApplicationController
private
def
get_commits
@commits
=
@project
.
repository
.
commits
(
@ref
,
limit:
2000
,
skip_merges:
true
)
@commits_limit
=
2000
@commits
=
@project
.
repository
.
commits
(
@ref
,
limit:
@commits_limit
,
skip_merges:
true
)
@commits_graph
=
Gitlab
::
Graphs
::
Commits
.
new
(
@commits
)
@commits_per_week_days
=
@commits_graph
.
commits_per_week_days
@commits_per_time
=
@commits_graph
.
commits_per_time
...
...
app/views/projects/graphs/charts.html.haml
View file @
dc4ceed1
...
...
@@ -20,6 +20,7 @@
-
end_time
=
capture
do
#{
@commits_graph
.
end_date
.
strftime
(
'%b %d'
)
}
=
(
_
(
"Commit statistics for %{ref} %{start_time} - %{end_time}"
)
%
{
ref:
"<strong>
#{
h
@ref
}
</strong>"
,
start_time:
start_time
,
end_time:
end_time
}).
html_safe
=
_
(
"Excluding merge commits. Limited to %{limit} commits."
)
%
{
limit:
number_with_delimiter
(
@commits_limit
,
delimiter:
','
)}
.col-md-6
.tree-ref-container
...
...
changelogs/unreleased/28627-adjust-commit-stats-over-limit-indication.yml
0 → 100644
View file @
dc4ceed1
---
title
:
Add commits limit text at graphs page
merge_request
:
24990
author
:
type
:
changed
locale/gitlab.pot
View file @
dc4ceed1
...
...
@@ -7872,6 +7872,9 @@ msgstr ""
msgid "Except policy:"
msgstr ""
msgid "Excluding merge commits. Limited to %{limit} commits."
msgstr ""
msgid "Excluding merge commits. Limited to 6,000 commits."
msgstr ""
...
...
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