Merge pull request #7617 from pkill/issue-280-commit-note-notifications

Issue-280 Send notifications when a note is added to a commit and author...

Merge pull request #7617 from pkill/issue-280-commit-note-notifications
95e8f979 · Dmitriy Zaporozhets · 1dc99b4c · 383ac10c · 95e8f979
Commit 95e8f979 authored Nov 12, 2014 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

note.rb app/models/note.rb +2 -2

No files found.
--- a/app/models/note.rb
+++ b/app/models/note.rb
@@ -260,8 +260,8 @@ class Note < ActiveRecord::Base

  def commit_author
    @commit_author ||=
-      project.users.find_by(email: noteable.author_email) ||
-      project.users.find_by(name: noteable.author_name)
+      project.team.users.find_by(email: noteable.author_email) ||
+      project.team.users.find_by(name: noteable.author_name)
  rescue
    nil
  end