mastodon/app/views/admin
Claire 954e052b07 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/media_attachment.rb`:
  Upstream moved hardcoded values around, while in glitch-soc they are
  configurable.
  Moved them like upstream, but keeping glitch-soc's ability to configure
  them through env vars.
2022-02-22 18:06:29 +01:00
..
account_actions
account_warnings Fix link colors in report and strike details (#17616) 2022-02-22 15:27:25 +01:00
accounts Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
action_logs Merge branch 'main' into glitch-soc/merge-upstream 2022-01-17 10:45:25 +01:00
announcements
change_emails
custom_emojis
dashboard Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
disputes/appeals Fix issue with glitch-soc's theming system 2022-02-17 10:59:01 +01:00
domain_allows
domain_blocks
email_domain_blocks
follow_recommendations Merge branch 'main' into glitch-soc/merge-upstream 2022-02-09 17:28:33 +01:00
instances Enable domain purge button on suspended domains too (#17209) 2022-02-11 22:23:19 +01:00
invites
ip_blocks
relationships Fix error on account relationships page in admin UI (#17444) 2022-02-05 05:06:34 +01:00
relays
report_notes Add appeals (#17364) 2022-02-14 21:27:53 +01:00
reports Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
rules
settings Change CAPTCHA handling to be only on email verification 2022-01-25 23:56:57 +01:00
statuses Merge branch 'main' into glitch-soc/merge-upstream 2022-01-17 10:45:25 +01:00
tags
trends Merge branch 'main' into glitch-soc/merge-upstream 2022-02-09 17:28:33 +01:00
warning_presets