summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorSato Hiroyuki <sathiroyuki@gmail.com>2013-02-05 19:58:49 +0900
committerSato Hiroyuki <sathiroyuki@gmail.com>2013-02-05 19:58:49 +0900
commit9dccecc9b54240a7088ceac554c3f9b6b24d51f7 (patch)
treedbdcac490af8afc3c99b3199aeed897f78b9bbf2 /lib
parentdf85c9c06ae3d687bb6ec2f2d11a8ae71fa8ed5f (diff)
downloadgitlab-ce-9dccecc9b54240a7088ceac554c3f9b6b24d51f7.tar.gz
Sort the commits on network graph by commiter date.
Author date is not updated, if the commits is rebased. So the network graph having many rebased commit turns round and round, that it is very difficult to undarstand history.
Diffstat (limited to 'lib')
-rw-r--r--lib/gitlab/graph/json_builder.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/graph/json_builder.rb b/lib/gitlab/graph/json_builder.rb
index 8f31c820be1..cc971a245a7 100644
--- a/lib/gitlab/graph/json_builder.rb
+++ b/lib/gitlab/graph/json_builder.rb
@@ -33,7 +33,7 @@ module Gitlab
#
def collect_commits
- @commits = Grit::Commit.find_all(repo, nil, {max_count: self.class.max_count, skip: to_commit}).dup
+ @commits = Grit::Commit.find_all(repo, nil, {topo_order: true, max_count: self.class.max_count, skip: to_commit}).dup
# Decorate with app/models/commit.rb
@commits.map! { |commit| ::Commit.new(commit) }
@@ -86,7 +86,7 @@ module Gitlab
# Skip count that the target commit is displayed in center.
def to_commit
- commits = Grit::Commit.find_all(repo, nil)
+ commits = Grit::Commit.find_all(repo, nil, {topo_order: true})
commit_index = commits.index do |c|
c.id == @commit.id
end