Commit aa36f07a02b524c843374968af6a6c122d980bd7
1 parent
d8a40d8c
Exists in
master
and in
4 other branches
Fix the commits are not ordered commiter date.
It is fixed that the date label of network graph is broken.
Showing
1 changed file
with
2 additions
and
2 deletions
Show diff stats
app/models/graph/json_builder.rb
| @@ -32,7 +32,7 @@ module Graph | @@ -32,7 +32,7 @@ module Graph | ||
| 32 | # | 32 | # |
| 33 | def collect_commits | 33 | def collect_commits |
| 34 | 34 | ||
| 35 | - @commits = Grit::Commit.find_all(repo, nil, {topo_order: true, max_count: self.class.max_count, skip: to_commit}).dup | 35 | + @commits = Grit::Commit.find_all(repo, nil, {date_order: true, max_count: self.class.max_count, skip: to_commit}).dup |
| 36 | 36 | ||
| 37 | # Decorate with app/models/commit.rb | 37 | # Decorate with app/models/commit.rb |
| 38 | @commits.map! { |commit| Commit.new(commit) } | 38 | @commits.map! { |commit| Commit.new(commit) } |
| @@ -85,7 +85,7 @@ module Graph | @@ -85,7 +85,7 @@ module Graph | ||
| 85 | 85 | ||
| 86 | # Skip count that the target commit is displayed in center. | 86 | # Skip count that the target commit is displayed in center. |
| 87 | def to_commit | 87 | def to_commit |
| 88 | - commits = Grit::Commit.find_all(repo, nil, {topo_order: true}) | 88 | + commits = Grit::Commit.find_all(repo, nil, {date_order: true}) |
| 89 | commit_index = commits.index do |c| | 89 | commit_index = commits.index do |c| |
| 90 | c.id == @commit.id | 90 | c.id == @commit.id |
| 91 | end | 91 | end |