diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-09-26 10:33:06 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-09-26 10:33:06 +0300 |
| commit | 3cb663f5c9359d809ecc82cc29a62d7658a48fbe (patch) | |
| tree | a989b4ab97dfea615c6d0f4a511b8b21d9b5f7e3 | |
| parent | 02cf9aa6873c4c2e35dfedc8d4c6ad375bd8a219 (diff) | |
| download | gitlab-ce-3cb663f5c9359d809ecc82cc29a62d7658a48fbe.tar.gz | |
Remove project transfer page since we already have multiple owners for group
| -rw-r--r-- | app/controllers/groups_controller.rb | 10 | ||||
| -rw-r--r-- | app/views/groups/edit.html.haml | 13 |
2 files changed, 1 insertions, 22 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 9dc9afe9e67..caf8ef85e87 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -73,15 +73,7 @@ class GroupsController < ApplicationController end def update - group_params = params[:group].dup - owner_id = group_params.delete(:owner_id) - - if owner_id - @group.owner = User.find(owner_id) - @group.save - end - - if @group.update_attributes(group_params) + if @group.update_attributes(params[:group]) redirect_to @group, notice: 'Group was successfully updated.' else render action: "edit" diff --git a/app/views/groups/edit.html.haml b/app/views/groups/edit.html.haml index 8aefdf7f513..2682d31ff47 100644 --- a/app/views/groups/edit.html.haml +++ b/app/views/groups/edit.html.haml @@ -10,8 +10,6 @@ %i.icon-folder-close Projects %li - = link_to 'Transfer', '#tab-transfer', 'data-toggle' => 'tab' - %li = link_to 'Remove', '#tab-remove', 'data-toggle' => 'tab' .span10 @@ -65,17 +63,6 @@ - if @group.projects.blank? %p.nothing_here_message This group has no projects yet - .tab-pane#tab-transfer - .ui-box.ui-box-danger - .title Transfer group - .ui-box-body - %p - Transferring group will cause loss of admin control over group and all child projects - = form_for @group do |f| - = users_select_tag(:'group[owner_id]') - %hr - = f.submit 'Transfer group', class: "btn btn-small btn-remove" - .tab-pane#tab-remove .ui-box.ui-box-danger .title Remove group |