diff options
| author | Paco Guzman <pacoguzmanp@gmail.com> | 2016-04-22 15:07:25 +0300 |
|---|---|---|
| committer | Paco Guzman <pacoguzmanp@gmail.com> | 2016-04-29 10:26:52 +0300 |
| commit | c4b9bd041321df25764ad1de90f89b1f0dda9f33 (patch) | |
| tree | 2517d2fdcf07838902a7eb7fedb788bcc5fa786d /app/controllers/projects/graphs_controller.rb | |
| parent | a792427eed95570da22844a06a09227730443189 (diff) | |
API support for the 'since' and 'until' operators on commit requests
- Parameter validation as ISO8601 format
Diffstat (limited to 'app/controllers/projects/graphs_controller.rb')
| -rw-r--r-- | app/controllers/projects/graphs_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/projects/graphs_controller.rb b/app/controllers/projects/graphs_controller.rb index d13ea9f34b6..092ef32e6e3 100644 --- a/app/controllers/projects/graphs_controller.rb +++ b/app/controllers/projects/graphs_controller.rb @@ -17,7 +17,7 @@ class Projects::GraphsController < Projects::ApplicationController end def commits - @commits = @project.repository.commits(@ref, nil, 2000, 0, true) + @commits = @project.repository.commits(@ref, limit: 2000, 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 @@ -55,7 +55,7 @@ class Projects::GraphsController < Projects::ApplicationController private def fetch_graph - @commits = @project.repository.commits(@ref, nil, 6000, 0, true) + @commits = @project.repository.commits(@ref, limit: 6000, skip_merges: true) @log = [] @commits.each do |commit| |