summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-10-17 16:55:08 +0200
committerRiyad Preukschas <riyad@informatik.uni-bremen.de>2012-10-18 20:16:52 +0200
commitb3a5f0a78d1d3e6d6ec3655ca1c936d983b7d69c (patch)
tree28a392e178c88d674ca2df1b893061b6cd76149a
parent51ef5b929708d3ad90b6db6afbb78ee24eeb8aa1 (diff)
downloadgitlab-ce-b3a5f0a78d1d3e6d6ec3655ca1c936d983b7d69c.tar.gz
Fix wrong parameter order in Team#team_member_by_name_or_email
-rw-r--r--app/roles/team.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/roles/team.rb b/app/roles/team.rb
index 8aef405aaf3..a7ba0588cf5 100644
--- a/app/roles/team.rb
+++ b/app/roles/team.rb
@@ -1,7 +1,7 @@
module Team
- 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
+ def team_member_by_name_or_email(name = nil, email = nil)
+ user = users.where("name like ? or email like ?", name, email).first
+ users_projects.where(user: user) if user
end
# Get Team Member record by user id