summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
Diffstat (limited to 'app/models')
-rw-r--r--app/models/issue.rb4
-rw-r--r--app/models/note.rb4
-rw-r--r--app/models/project.rb6
-rw-r--r--app/models/repository.rb2
4 files changed, 8 insertions, 8 deletions
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 19b174d86b7..ac921d7f675 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -11,8 +11,8 @@ class Issue < ActiveRecord::Base
validates_presence_of :author_id
delegate :name,
- :email,
- :to => :author,
+ :email,
+ :to => :author,
:prefix => true
validates :title,
diff --git a/app/models/note.rb b/app/models/note.rb
index c3c10639bf9..449ab3ebc80 100644
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -8,8 +8,8 @@ class Note < ActiveRecord::Base
:class_name => "User"
delegate :name,
- :email,
- :to => :author,
+ :email,
+ :to => :author,
:prefix => true
attr_protected :author, :author_id
diff --git a/app/models/project.rb b/app/models/project.rb
index e4448e786e9..ab9a2e7b9d7 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -121,9 +121,9 @@ class Project < ActiveRecord::Base
private_flag
end
- def last_activity
+ def last_activity
updates(1).first
- rescue
+ rescue
nil
end
@@ -132,7 +132,7 @@ class Project < ActiveRecord::Base
end
def updates(n = 3)
- [
+ [
fresh_commits(n),
issues.last(n),
notes.fresh.limit(n)
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 5a2b71a4c5e..7c245a8730f 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -9,7 +9,7 @@ class Repository
@project = project
end
- def path
+ def path
@path ||= project.path
end