tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `.github/dependabot.yml`:
  Upstream modified it, but we deleted it in glitch-soc.
  Keep it deleted.
This commit is contained in:
Claire
2022-03-22 17:00:38 +01:00
parent 9ff119eecd 67d550830b
commit 59864ff495
80 changed files with 684 additions and 568 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/settings/aliases/index.html.haml
View File

@@ -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 }

4
app/views/settings/migrations/show.html.haml
View File

@@ -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