Commit b4868a89 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Improved commit author detection

parent 61a311496b9b
......@@ -50,6 +50,11 @@ def to_param
code
end
def team_member_by_name_or_email(email = nil, name = nil)
user = users.where("email like ? or name like ?", email, name).first
users_projects.find_by_user_id(user.id) if user
end
def common_notes
notes.where(:noteable_type => ["", nil])
end
......
......@@ -13,6 +13,6 @@
ago
%td.commit
= link_to truncate(content_commit.safe_message, :length => fixed_mode? ? 40 : 80), project_commit_path(@project, content_commit), :class => "tree-commit-link"
- user = @project.users.find_by_email(content_commit.author_email)
- if user
= link_to "[#{user.name}]", project_team_member_path(@project, @project.users_projects.find_by_user_id(user.id))
- tm = @project.team_member_by_name_or_email(content_commit.author_email, content_commit.author_name)
- if tm
= link_to "[#{tm.user_name}]", project_team_member_path(@project, tm)
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