Commit c7f918aa authored by Sean McGivern's avatar Sean McGivern

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
parents 349d6b03 ffbc66cc
......@@ -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
......
---
title: Group transfer now properly redirects to edit on failure
merge_request: 26837
author:
type: fixed
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment