summaryrefslogtreecommitdiff
path: root/app/controllers/admin
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-03-13 16:22:03 +0100
committerDouwe Maan <douwe@gitlab.com>2015-03-15 13:50:38 +0100
commit31fc73f0a9b9225ba3737b9525fcf7a1695a45f2 (patch)
tree9133896ed94f8132a76acd9735f1e29f7c1db8b6 /app/controllers/admin
parent99f995755ef4b445216dd7baae35f5a4846ef30c (diff)
downloadgitlab-ce-31fc73f0a9b9225ba3737b9525fcf7a1695a45f2.tar.gz
Use `project_member` instead of `team_member`.
Diffstat (limited to 'app/controllers/admin')
-rw-r--r--app/controllers/admin/groups_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb
index e338abeac4c..9d9adaa467f 100644
--- a/app/controllers/admin/groups_controller.rb
+++ b/app/controllers/admin/groups_controller.rb
@@ -1,5 +1,5 @@
class Admin::GroupsController < Admin::ApplicationController
- before_filter :group, only: [:edit, :show, :update, :destroy, :project_update, :project_teams_update]
+ before_filter :group, only: [:edit, :show, :update, :destroy, :project_update, :members_update]
def index
@groups = Group.all
@@ -40,7 +40,7 @@ class Admin::GroupsController < Admin::ApplicationController
end
end
- def project_teams_update
+ def members_update
@group.add_users(params[:user_ids].split(','), params[:access_level])
redirect_to [:admin, @group], notice: 'Users were successfully added.'