diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-03-13 16:22:03 +0100 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-03-15 13:50:38 +0100 |
commit | 31fc73f0a9b9225ba3737b9525fcf7a1695a45f2 (patch) | |
tree | 9133896ed94f8132a76acd9735f1e29f7c1db8b6 /app/models/project.rb | |
parent | 99f995755ef4b445216dd7baae35f5a4846ef30c (diff) | |
download | gitlab-ce-31fc73f0a9b9225ba3737b9525fcf7a1695a45f2.tar.gz |
Use `project_member` instead of `team_member`.
Diffstat (limited to 'app/models/project.rb')
-rw-r--r-- | app/models/project.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/project.rb b/app/models/project.rb index c45338bf4eb..f0b416c8f4a 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -445,13 +445,13 @@ class Project < ActiveRecord::Base end end - def team_member_by_name_or_email(name = nil, email = nil) + def project_member_by_name_or_email(name = nil, email = nil) user = users.where('name like ? or email like ?', name, email).first project_members.where(user: user) if user end # Get Team Member record by user id - def team_member_by_id(user_id) + def project_member_by_id(user_id) project_members.find_by(user_id: user_id) end |