mastodon/app/views/admin
Claire f9d000ebae Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/services/resolve_url_service.rb`:
  The private toot search by URL hack has been revamped upstream.
  Took upstream's version.
2020-12-19 00:55:12 +01:00
..
account_actions
account_moderation_notes
account_warnings
accounts Fix admins being able to suspend their instance actor (#14567) 2020-12-15 17:23:58 +01:00
action_logs Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
announcements
change_emails
custom_emojis Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
dashboard
domain_allows Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
domain_blocks Merge branch 'master' into glitch-soc/merge-upstream 2020-12-19 00:55:12 +01:00
email_domain_blocks
instances Fix performance on instances list in admin UI (#15282) 2020-12-14 09:06:34 +01:00
invites
ip_blocks Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
pending_accounts Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
relationships
relays
report_notes
reports Merge branch 'master' into glitch-soc/merge-upstream 2020-12-15 14:27:06 +01:00
settings Merge branch 'master' into glitch-soc/merge-upstream 2020-12-19 00:55:12 +01:00
statuses Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
tags Add subresource integrity for JS and CSS assets (#15096) 2020-11-06 11:56:31 +01:00
warning_presets