diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-04-04 15:13:42 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-04-04 15:13:42 +0000 |
| commit | c7f918aa691b1b9c6ee6a489ae28a094eacff72c (patch) | |
| tree | abeffe14065f7206fe52553c102eb46f5f0014ff | |
| parent | 349d6b0326286b6ff3831fc0d8c499b42967c6d2 (diff) | |
| parent | ffbc66cc0bb62b962779aea4d4b0c06dcf12078e (diff) | |
| download | gitlab-ce-c7f918aa691b1b9c6ee6a489ae28a094eacff72c.tar.gz | |
Merge branch 'xanf/gitlab-ce-transfer-disables-js' into 'master'
Resolve "Failing group transfer disables expandable sections"
Closes #45511
See merge request gitlab-org/gitlab-ce!26837
| -rw-r--r-- | app/controllers/groups_controller.rb | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/xanf-gitlab-ce-transfer-disables-js.yml | 5 | ||||
| -rw-r--r-- | spec/controllers/groups_controller_spec.rb | 2 |
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 |