diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-11-12 12:17:27 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-11-12 12:17:27 +0200 |
| commit | 95e8f9797a5027cc6ad1276055271ac29a4e8c62 (patch) | |
| tree | e47f6090187f4aa059d3f0612bcd3053f0fdaedc | |
| parent | 1dc99b4cbb9a98264fb9cda6f9848020b972b0fa (diff) | |
| parent | 383ac10ca5797818f7a61d04fbff0fbf54e87c0e (diff) | |
| download | gitlab-ce-95e8f9797a5027cc6ad1276055271ac29a4e8c62.tar.gz | |
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...
| -rw-r--r-- | app/models/note.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/note.rb b/app/models/note.rb index 4252d57ccb1..df45d023a00 100644 --- 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 |