Merge branch 'master' of dev.gitlabhq.com:gitlabhq

This commit is contained in:
gitlabhq 2011-11-15 04:09:13 -05:00
commit 12782adf03
66 changed files with 493 additions and 440 deletions

View file

@ -129,9 +129,9 @@ class Project < ActiveRecord::Base
private_flag
end
def last_activity
def last_activity
updates(1).first
rescue
rescue
nil
end
@ -140,7 +140,7 @@ class Project < ActiveRecord::Base
end
def updates(n = 3)
[
[
fresh_commits(n),
fresh_issues(n),
fresh_notes(n)