Skip to content

Commit 2b5f20e

Browse files
committed
Merge pull request #6784 from cmrd-senya/deletion-redirect-fixup
Redirect to "/users/sign_in" after AccountDeletion
2 parents d6171e5 + 77bd220 commit 2b5f20e

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

Changelog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ Contributions are very welcome, the hard work is done!
9898
* Improve search and mentions suggestions [#6788](https://github.com/diaspora/diaspora/pull/6788)
9999
* Redesign back to top button [#6782](https://github.com/diaspora/diaspora/pull/6782)
100100
* Adjusted Facebook integration for a successful review [#6778](https://github.com/diaspora/diaspora/pull/6778)
101+
* Redirect to the sign-in page instead of the stream on account deletion [#6784](https://github.com/diaspora/diaspora/pull/6784)
101102

102103
## Bug fixes
103104
* Destroy Participation when removing interactions with a post [#5852](https://github.com/diaspora/diaspora/pull/5852)

app/controllers/users_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ def destroy
9595
if params[:user] && params[:user][:current_password] && current_user.valid_password?(params[:user][:current_password])
9696
current_user.close_account!
9797
sign_out current_user
98-
redirect_to(stream_path, :notice => I18n.t('users.destroy.success'))
98+
redirect_to(new_user_session_path(format: request[:format]), notice: I18n.t("users.destroy.success"))
9999
else
100100
if params[:user].present? && params[:user][:current_password].present?
101101
flash[:error] = t 'users.destroy.wrong_password'

0 commit comments

Comments
 (0)