summaryrefslogtreecommitdiff
path: root/app/controllers/teams
diff options
context:
space:
mode:
authorAndrey Kumanyaev <me@zzet.org>2013-01-23 23:39:47 +0400
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-01-24 22:31:48 +0200
commit690db9693fcee3beedc467b48fd9e4bd42ee936d (patch)
tree5a170279c4b1ce7ec59479066187f0b6b0cb3b30 /app/controllers/teams
parenteb99feb4a7e01c4e83203ec014c082205b77ad02 (diff)
downloadgitlab-ce-690db9693fcee3beedc467b48fd9e4bd42ee936d.tar.gz
fix tests
Diffstat (limited to 'app/controllers/teams')
-rw-r--r--app/controllers/teams/members_controller.rb11
1 files changed, 4 insertions, 7 deletions
diff --git a/app/controllers/teams/members_controller.rb b/app/controllers/teams/members_controller.rb
index 95b8de1861b..56e952a3d40 100644
--- a/app/controllers/teams/members_controller.rb
+++ b/app/controllers/teams/members_controller.rb
@@ -20,7 +20,7 @@ class Teams::MembersController < Teams::ApplicationController
user_team.add_members(user_ids, access, is_admin)
end
- redirect_to team_path(user_team), notice: 'Members was successfully added into Team of users.'
+ redirect_to team_members_path(user_team), notice: 'Members was successfully added into Team of users.'
end
def edit
@@ -30,18 +30,15 @@ class Teams::MembersController < Teams::ApplicationController
def update
options = {default_projects_access: params[:default_project_access], group_admin: params[:group_admin]}
if user_team.update_membership(team_member, options)
- redirect_to team_path(user_team), notice: "Membership for #{team_member.name} was successfully updated in Team of users."
+ redirect_to team_members_path(user_team), notice: "Membership for #{team_member.name} was successfully updated in Team of users."
else
render :edit
end
end
def destroy
- if user_team.remove_member(team_member)
- redirect_to team_path(user_team), notice: "Member #{team_member.name} was successfully removed from Team of users."
- else
- redirect_to team_members(user_team), notice: "Something is wrong."
- end
+ user_team.remove_member(team_member)
+ redirect_to team_path(user_team), notice: "Member #{team_member.name} was successfully removed from Team of users."
end
protected