diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2011-11-13 15:57:34 +0200 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2011-11-13 15:57:34 +0200 |
| commit | 762946995ea9d477f00fea19e5040bf4dd437cb9 (patch) | |
| tree | b94dc6074eeba1b49c0ed6427cb847f89227fd4f /app/models | |
| parent | dc844f013848ee1fa7721173bda3f3fc0ed0b8ba (diff) | |
| parent | 2f790001a029144f7a614d49a123cd1037f6398c (diff) | |
| download | gitlab-ce-762946995ea9d477f00fea19e5040bf4dd437cb9.tar.gz | |
Merge remote-tracking branch 'origin/master' into network_graph
Conflicts:
app/assets/stylesheets/projects.css.scss
lib/commit_ext.rb
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/repository.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/repository.rb b/app/models/repository.rb index 3b09471596c..5a2b71a4c5e 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -73,7 +73,7 @@ class Repository def fresh_commits(n = 10) commits = heads.map do |h| - repo.commits(h.name, n) + repo.commits(h.name, n).each { |c| c.head = h } end.flatten.uniq { |c| c.id } commits.sort! do |x, y| @@ -85,7 +85,7 @@ class Repository def commits_since(date) commits = heads.map do |h| - repo.log(h.name, nil, :since => date) + repo.log(h.name, nil, :since => date).each { |c| c.head = h } end.flatten.uniq { |c| c.id } commits.sort! do |x, y| |