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

2011-11-15 04:09:13 -05:00 · 2011-11-15 04:09:13 -05:00 · 12782adf03
commit 12782adf03
parent 6b9f221a27 d63f04ab16
66 changed files with 493 additions and 440 deletions
--- 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