Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
e1679d20
Commit
e1679d20
authored
Jan 25, 2013
by
Andrey Kumanyaev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update user finding (by username) in teams_members (project team) controller
parent
f225ff86
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
app/controllers/team_members_controller.rb
app/controllers/team_members_controller.rb
+2
-2
No files found.
app/controllers/team_members_controller.rb
View file @
e1679d20
...
@@ -39,7 +39,7 @@ class TeamMembersController < ProjectResourceController
...
@@ -39,7 +39,7 @@ class TeamMembersController < ProjectResourceController
end
end
def
destroy
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
@user_project_relation
.
destroy
respond_to
do
|
format
|
respond_to
do
|
format
|
...
@@ -59,6 +59,6 @@ class TeamMembersController < ProjectResourceController
...
@@ -59,6 +59,6 @@ class TeamMembersController < ProjectResourceController
protected
protected
def
member
def
member
@member
||=
User
.
find
(
params
[
:id
])
@member
||=
User
.
find
_by_username
(
params
[
:id
])
end
end
end
end
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment