Commit 69e4c55c authored by Thong Kuah's avatar Thong Kuah

Merge branch '28627-adjust-commit-stats-over-limit-indication' into 'master'

Add indicator to commits count over limit

Closes #28627

See merge request gitlab-org/gitlab!24990
parents b86db44f 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
......
......@@ -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
......
---
title: Add commits limit text at graphs page
merge_request: 24990
author:
type: changed
......@@ -7951,6 +7951,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 ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment