summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIllya Klymov <xanf@xanf.me>2019-04-02 04:14:19 +0300
committerIllya Klymov <xanf@xanf.me>2019-04-03 11:29:35 +0300
commitffbc66cc0bb62b962779aea4d4b0c06dcf12078e (patch)
tree062af37bc973194dfef84a418efc2cf5cdbf4509
parenta374d690e702f26036f38bf375ceb2a5cfa3fe23 (diff)
downloadgitlab-ce-ffbc66cc0bb62b962779aea4d4b0c06dcf12078e.tar.gz
Redirect to edit page on group transfer failurexanf/gitlab-ce-transfer-disables-js
-rw-r--r--app/controllers/groups_controller.rb4
-rw-r--r--changelogs/unreleased/xanf-gitlab-ce-transfer-disables-js.yml5
-rw-r--r--spec/controllers/groups_controller_spec.rb2
3 files changed, 8 insertions, 3 deletions
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 0192b1c253e..87b8ef03313 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -124,8 +124,8 @@ class GroupsController < Groups::ApplicationController
flash[:notice] = "Group '#{@group.name}' was successfully transferred."
redirect_to group_path(@group)
else
- flash.now[:alert] = service.error
- render :edit
+ flash[:alert] = service.error
+ redirect_to edit_group_path(@group)
end
end
# rubocop: enable CodeReuse/ActiveRecord
diff --git a/changelogs/unreleased/xanf-gitlab-ce-transfer-disables-js.yml b/changelogs/unreleased/xanf-gitlab-ce-transfer-disables-js.yml
new file mode 100644
index 00000000000..57c9a1aaa48
--- /dev/null
+++ b/changelogs/unreleased/xanf-gitlab-ce-transfer-disables-js.yml
@@ -0,0 +1,5 @@
+---
+title: Group transfer now properly redirects to edit on failure
+merge_request: 26837
+author:
+type: fixed
diff --git a/spec/controllers/groups_controller_spec.rb b/spec/controllers/groups_controller_spec.rb
index b2e6df6060a..38d7240ea81 100644
--- a/spec/controllers/groups_controller_spec.rb
+++ b/spec/controllers/groups_controller_spec.rb
@@ -616,7 +616,7 @@ describe GroupsController do
end
it 'should redirect to the current path' do
- expect(response).to render_template(:edit)
+ expect(response).to redirect_to(edit_group_path(group))
end
end