You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/app/views/admin
Claire d8fdbb054e Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/validators/status_length_validator.rb`:
  Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real
  conflict.
  Applied upstream changes.
- `package.json`:
  glitch-soc-only dependency textually too close to a dependency updated
  upstream, not a real conflict.
  Applied upstream changes.
5 years ago
..
account_actions Add inline description of moderation actions in moderation interface (#15792) 5 years ago
account_moderation_notes
account_warnings
accounts Fix admins being able to suspend their instance actor (#14567) 5 years ago
action_logs Add subresource integrity for JS and CSS assets (#15096) 5 years ago
announcements
change_emails
custom_emojis Add subresource integrity for JS and CSS assets (#15096) 5 years ago
dashboard
domain_allows Add subresource integrity for JS and CSS assets (#15096) 5 years ago
domain_blocks Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
email_domain_blocks
instances Fix performance on instances list in admin UI (#15282) 5 years ago
invites
ip_blocks Add subresource integrity for JS and CSS assets (#15096) 5 years ago
pending_accounts Add subresource integrity for JS and CSS assets (#15096) 5 years ago
relationships Fix admin-facing uses of inline CSS (#13575) 6 years ago
relays
report_notes
reports Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
rules Add server rules (#15769) 5 years ago
settings Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
statuses Add subresource integrity for JS and CSS assets (#15096) 5 years ago
tags Add subresource integrity for JS and CSS assets (#15096) 5 years ago
warning_presets