Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
ffbc66cc
Commit
ffbc66cc
authored
Apr 02, 2019
by
Illya Klymov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Redirect to edit page on group transfer failure
parent
a374d690
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
app/controllers/groups_controller.rb
app/controllers/groups_controller.rb
+2
-2
changelogs/unreleased/xanf-gitlab-ce-transfer-disables-js.yml
...gelogs/unreleased/xanf-gitlab-ce-transfer-disables-js.yml
+5
-0
spec/controllers/groups_controller_spec.rb
spec/controllers/groups_controller_spec.rb
+1
-1
No files found.
app/controllers/groups_controller.rb
View file @
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
re
nder
:edit
flash
[
:alert
]
=
service
.
error
re
direct_to
edit_group_path
(
@group
)
end
end
# rubocop: enable CodeReuse/ActiveRecord
...
...
changelogs/unreleased/xanf-gitlab-ce-transfer-disables-js.yml
0 → 100644
View file @
ffbc66cc
---
title
:
Group transfer now properly redirects to edit on failure
merge_request
:
26837
author
:
type
:
fixed
spec/controllers/groups_controller_spec.rb
View file @
ffbc66cc
...
...
@@ -616,7 +616,7 @@ describe GroupsController do
end
it
'should redirect to the current path'
do
expect
(
response
).
to
re
nder_template
(
:edit
)
expect
(
response
).
to
re
direct_to
(
edit_group_path
(
group
)
)
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment