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/settings | |
| 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/settings')
| -rw-r--r-- | app/views/settings/aliases/index.html.haml | 2 | ||||
| -rw-r--r-- | app/views/settings/migrations/show.html.haml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/views/settings/aliases/index.html.haml b/app/views/settings/aliases/index.html.haml index 5df0c9669..c618a82f1 100644 --- a/app/views/settings/aliases/index.html.haml +++ b/app/views/settings/aliases/index.html.haml @@ -29,5 +29,5 @@ - else - @aliases.each do |account_alias| %tr - %td= account_alias.acct + %td= account_alias.pretty_acct %td= table_link_to 'trash', t('aliases.remove'), settings_alias_path(account_alias), data: { method: :delete } diff --git a/app/views/settings/migrations/show.html.haml b/app/views/settings/migrations/show.html.haml index 078eaebc6..492f6fe12 100644 --- a/app/views/settings/migrations/show.html.haml +++ b/app/views/settings/migrations/show.html.haml @@ -8,7 +8,7 @@ = render 'application/card', account: current_account.moved_to_account .fields-row__column.fields-group.fields-row__column-6 %p.hint - %span.positive-hint= t('migrations.redirecting_to', acct: current_account.moved_to_account.acct) + %span.positive-hint= t('migrations.redirecting_to', acct: current_account.moved_to_account.pretty_acct) %p.hint= t('migrations.cancel_explanation') @@ -76,7 +76,7 @@ - if migration.target_account.present? = compact_account_link_to migration.target_account - else - = migration.acct + = migration.pretty_acct %td= number_with_delimiter migration.followers_count |