diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-03-22 17:00:38 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-03-22 17:00:38 +0100 |
| commit | 59864ff495cb607b4e2632b8b8ca183c1e602626 (patch) | |
| tree | 7dfc6dc1fff3d8864497d0ed32aff5862b5e47e9 /app/views/auth | |
| parent | 9ff119eecd1079e52a8a41d7b8d61520c4303c2f (diff) | |
| parent | 67d550830b3b1a9a2b65b1ab98ea4bcd491666c5 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.github/dependabot.yml`: Upstream modified it, but we deleted it in glitch-soc. Keep it deleted.
Diffstat (limited to 'app/views/auth')
| -rw-r--r-- | app/views/auth/registrations/_status.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/auth/registrations/_status.html.haml b/app/views/auth/registrations/_status.html.haml index 68954a5da..759bbc41c 100644 --- a/app/views/auth/registrations/_status.html.haml +++ b/app/views/auth/registrations/_status.html.haml @@ -7,7 +7,7 @@ = t('auth.status.pending') - elsif @user.account.moved_to_account_id.present? .flash-message.warning - = t('auth.status.redirecting_to', acct: @user.account.moved_to_account.acct) + = t('auth.status.redirecting_to', acct: @user.account.moved_to_account.pretty_acct) = link_to t('migrations.cancel'), settings_migration_path %h3= t('auth.status.account_status') |