summaryrefslogtreecommitdiff
path: root/app/views/projects
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-02-24 09:08:51 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-02-24 09:08:51 +0000
commit38149afcf95e7669a7a99828c579d185b70c04dc (patch)
tree3a90504bd926407c0cc60f44e20dba08217b928b /app/views/projects
parentbe660fe1d28a65ad61be24c71e66ae90f6488dc4 (diff)
downloadgitlab-ce-38149afcf95e7669a7a99828c579d185b70c04dc.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/projects')
-rw-r--r--app/views/projects/graphs/charts.html.haml1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/views/projects/graphs/charts.html.haml b/app/views/projects/graphs/charts.html.haml
index b38449b3ab9..cb76e89f736 100644
--- a/app/views/projects/graphs/charts.html.haml
+++ b/app/views/projects/graphs/charts.html.haml
@@ -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