Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kazuhiko Shiozaki
gitlab-ce
Commits
aa36f07a
Commit
aa36f07a
authored
Feb 26, 2013
by
Sato Hiroyuki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the commits are not ordered commiter date.
It is fixed that the date label of network graph is broken.
parent
d8a40d8c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
app/models/graph/json_builder.rb
app/models/graph/json_builder.rb
+2
-2
No files found.
app/models/graph/json_builder.rb
View file @
aa36f07a
...
@@ -32,7 +32,7 @@ module Graph
...
@@ -32,7 +32,7 @@ module Graph
#
#
def
collect_commits
def
collect_commits
@commits
=
Grit
::
Commit
.
find_all
(
repo
,
nil
,
{
topo
_order:
true
,
max_count:
self
.
class
.
max_count
,
skip:
to_commit
}).
dup
@commits
=
Grit
::
Commit
.
find_all
(
repo
,
nil
,
{
date
_order:
true
,
max_count:
self
.
class
.
max_count
,
skip:
to_commit
}).
dup
# Decorate with app/models/commit.rb
# Decorate with app/models/commit.rb
@commits
.
map!
{
|
commit
|
Commit
.
new
(
commit
)
}
@commits
.
map!
{
|
commit
|
Commit
.
new
(
commit
)
}
...
@@ -85,7 +85,7 @@ module Graph
...
@@ -85,7 +85,7 @@ module Graph
# Skip count that the target commit is displayed in center.
# Skip count that the target commit is displayed in center.
def
to_commit
def
to_commit
commits
=
Grit
::
Commit
.
find_all
(
repo
,
nil
,
{
topo
_order:
true
})
commits
=
Grit
::
Commit
.
find_all
(
repo
,
nil
,
{
date
_order:
true
})
commit_index
=
commits
.
index
do
|
c
|
commit_index
=
commits
.
index
do
|
c
|
c
.
id
==
@commit
.
id
c
.
id
==
@commit
.
id
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment