diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2023-03-16 23:09:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-16 23:09:53 +0100 |
| commit | f5daa20f2a90098c9d689c5ec9d95ce9887b3a33 (patch) | |
| tree | a225407cb43edf3fa9d9ac0100021a380e11ff91 /app/controllers/auth/omniauth_callbacks_controller.rb | |
| parent | 6a0ed45aa3f11f0343a7be556b36b4d075ba08df (diff) | |
| parent | 32418f0ff3e7f25ca67334585d6d8442b34cb4af (diff) | |
Merge pull request #2134 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/auth/omniauth_callbacks_controller.rb')
| -rw-r--r-- | app/controllers/auth/omniauth_callbacks_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/auth/omniauth_callbacks_controller.rb b/app/controllers/auth/omniauth_callbacks_controller.rb index 3d7962de5..9e0fb942a 100644 --- a/app/controllers/auth/omniauth_callbacks_controller.rb +++ b/app/controllers/auth/omniauth_callbacks_controller.rb @@ -33,7 +33,7 @@ class Auth::OmniauthCallbacksController < Devise::OmniauthCallbacksController def after_sign_in_path_for(resource) if resource.email_present? - root_path + stored_location_for(resource) || root_path else auth_setup_path(missing_email: '1') end |