5 commits

Author	SHA1	Message	Date
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
Eugen Rochko	0fb9536d38	Add batch suspend for accounts in admin UI (#17009)	2021-12-05 21:48:39 +01:00
Eugen Rochko	9b1f2a4b61	Add subresource integrity for JS and CSS assets (#15096) ... Fix #2744	2020-11-06 11:56:31 +01:00
Thibaut Girka	5a41704f89	Fix IP blocks in admin panel ... It was broken due to discrepancies between upstream and glitch-soc's theming system.	2020-10-28 23:55:41 +01:00
Eugen Rochko	5e1364c448	Add IP-based rules (#14963)	2020-10-12 16:33:49 +02:00