diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2018-07-05 20:57:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-05 20:57:35 +0200 |
| commit | baff4a7ce01907c924beae1a3c7fe5524261e753 (patch) | |
| tree | 78e9dee007af8364d2e2e461e32b76747d4ec2be | |
| parent | 32a4b524fb95799cfebd9a9e76ef42019d22c5f1 (diff) | |
| download | mastodon-baff4a7ce01907c924beae1a3c7fe5524261e753.tar mastodon-baff4a7ce01907c924beae1a3c7fe5524261e753.tar.gz mastodon-baff4a7ce01907c924beae1a3c7fe5524261e753.tar.bz2 mastodon-baff4a7ce01907c924beae1a3c7fe5524261e753.zip | |
If signed in, redirect autofollow invite to profile page (#7956)
Fix #7944
| -rw-r--r-- | app/controllers/auth/registrations_controller.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/app/controllers/auth/registrations_controller.rb b/app/controllers/auth/registrations_controller.rb index c095411c1..58961554e 100644 --- a/app/controllers/auth/registrations_controller.rb +++ b/app/controllers/auth/registrations_controller.rb @@ -39,6 +39,16 @@ class Auth::RegistrationsController < Devise::RegistrationsController new_user_session_path end + def after_sign_in_path_for(_resource) + set_invite + + if @invite&.autofollow? + short_account_path(@invite.user.account) + else + super + end + end + def after_inactive_sign_up_path_for(_resource) new_user_session_path end |