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	Add inline description of moderation actions in moderation interface (#15792)	2021-02-24 16:53:16 +01:00
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	Add subresource integrity for JS and CSS assets (#15096)	2020-11-06 11:56:31 +01:00
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	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	Fix some ignored brakeman warnings (#15829)	2021-03-07 07:06:56 +01:00
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	Merge branch 'main' into glitch-soc/merge-upstream	2021-12-16 16:20:44 +01:00
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	Fix missing source strings and inconsistent lead text style in admin UI (#16052)	2021-04-17 11:12:49 +02:00
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	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-25 23:50:35 +01:00
trends	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-09 17:28:33 +01:00
warning_presets