Claire b2526316f5 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/pending_accounts/index.html.haml`: Removed upstream, while it had glitch-soc-specific changes to accomodate for glitch-soc's theming system. Removed the file. Additional changes: - `app/views/admin/accounts/index.html.haml': Accomodate for glitch-soc's theming system.		2021-12-16 16:20:44 +01:00
..
account_actions	Add inline description of moderation actions in moderation interface (#15792)	2021-02-24 16:53:16 +01:00
account_moderation_notes	…
account_warnings	Add moderation warnings (#9519)	2018-12-22 20:02:09 +01:00
accounts	Merge branch 'main' into glitch-soc/merge-upstream	2021-12-16 16:20:44 +01:00
action_logs	Merge branch 'main' into glitch-soc/merge-upstream	2021-03-24 10:53:50 +01:00
announcements	Fix design of announcements in admin UI (#12989)	2020-01-28 02:21:00 +01:00
change_emails	Hide misleading “You will be sent a confirmation e-mail” hint from admin view (#9973)	2019-02-05 15:11:35 +01:00
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	2021-12-16 16:20:44 +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	2021-07-08 16:17:19 +02:00
instances	Add batch suspend for accounts in admin UI (#17009)	2021-12-05 21:48:39 +01:00
invites	Fix maxed-out invites not showing up as expired in UI (#10274)	2019-03-15 05:35:17 +01:00
ip_blocks	Merge branch 'main' into glitch-soc/merge-upstream	2021-12-16 16:20:44 +01:00
relationships	Fix admin-facing uses of inline CSS (#13575)	2020-04-28 19:39:16 +02:00
relays	Display pending message on admin relays UI (#8494)	2018-08-28 05:39:43 +02:00
report_notes	…
reports	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-11 21:41:23 +02:00
rules	Fix missing source strings and inconsistent lead text style in admin UI (#16052)	2021-04-17 11:12:49 +02:00
settings	Merge branch 'main' into glitch-soc/merge-upstream	2021-11-26 22:53:55 +01:00
statuses	Add subresource integrity for JS and CSS assets (#15096)	2020-11-06 11:56:31 +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	2021-11-26 01:15:32 +01:00
warning_presets	Add titles to warning presets in admin UI (#13252)	2020-03-12 17:57:59 +01:00