Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorAndrey Kumanyaev <me@zzet.org>2013-01-25 22:34:49 +0400
committerAndrey Kumanyaev <me@zzet.org>2013-01-25 22:34:49 +0400
commite1679d20c7f3e51ef63a5730543914bc9e1f1ae2 (patch)
treee196d22c5b7226c79bb060391a7740e302751d0d /app
parentf225ff86743fca4c6957790d78b66ba663d5b40d (diff)
Update user finding (by username) in teams_members (project team) controller
Diffstat (limited to 'app')
-rw-r--r--app/controllers/team_members_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/team_members_controller.rb b/app/controllers/team_members_controller.rb
index 7e4c8792b50..18d4ae3ac96 100644
--- a/app/controllers/team_members_controller.rb
+++ b/app/controllers/team_members_controller.rb
@@ -39,7 +39,7 @@ class TeamMembersController < ProjectResourceController
end
def destroy
- @user_project_relation = project.users_projects.find_by_user_id(params[:id])
+ @user_project_relation = project.users_projects.find_by_user_id(member)
@user_project_relation.destroy
respond_to do |format|
@@ -59,6 +59,6 @@ class TeamMembersController < ProjectResourceController
protected
def member
- @member ||= User.find(params[:id])
+ @member ||= User.find_by_username(params[:id])
end
end