summaryrefslogtreecommitdiff
path: root/app/controllers
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/controllers
parentbe660fe1d28a65ad61be24c71e66ae90f6488dc4 (diff)
downloadgitlab-ce-38149afcf95e7669a7a99828c579d185b70c04dc.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/projects/graphs_controller.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/projects/graphs_controller.rb b/app/controllers/projects/graphs_controller.rb
index 67d3f49af18..889dcefb65a 100644
--- a/app/controllers/projects/graphs_controller.rb
+++ b/app/controllers/projects/graphs_controller.rb
@@ -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