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
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-04-10 16:13:00 +0300
committerDouwe Maan <douwe@gitlab.com>2015-04-14 13:06:43 +0300
commitcee98f22478b5ec27f91da04fe564a9760f79a38 (patch)
treef0db62af85b1ce903e52a4096a62a51c17098476 /app/controllers
parent629fa7fbe3a8a2f06d7c053ddcbcd78beed24e9c (diff)
Reference project members by id instead of user_id.
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/projects/project_members_controller.rb8
1 files changed, 2 insertions, 6 deletions
diff --git a/app/controllers/projects/project_members_controller.rb b/app/controllers/projects/project_members_controller.rb
index e534db7af84..99ee3ebf92e 100644
--- a/app/controllers/projects/project_members_controller.rb
+++ b/app/controllers/projects/project_members_controller.rb
@@ -41,12 +41,12 @@ class Projects::ProjectMembersController < Projects::ApplicationController
end
def update
- @project_member = @project.project_members.find_by(user_id: member)
+ @project_member = @project.project_members.find(params[:id])
@project_member.update_attributes(member_params)
end
def destroy
- @project_member = @project.project_members.find_by(user_id: member)
+ @project_member = @project.project_members.find(params[:id])
@project_member.destroy
respond_to do |format|
@@ -78,10 +78,6 @@ class Projects::ProjectMembersController < Projects::ApplicationController
protected
- def member
- @member ||= User.find_by(username: params[:id])
- end
-
def member_params
params.require(:project_member).permit(:user_id, :access_level)
end