Commit 95e8f979 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

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...
parents 1dc99b4c 383ac10c
...@@ -260,8 +260,8 @@ class Note < ActiveRecord::Base ...@@ -260,8 +260,8 @@ class Note < ActiveRecord::Base
def commit_author def commit_author
@commit_author ||= @commit_author ||=
project.users.find_by(email: noteable.author_email) || project.team.users.find_by(email: noteable.author_email) ||
project.users.find_by(name: noteable.author_name) project.team.users.find_by(name: noteable.author_name)
rescue rescue
nil nil
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment