This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Claire 392ca0472a Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/admin.js`: Conflicts due to glitch-soc's theming system. Upstream changes have been ported to `app/javascript/core/admin.js` - `app/models/trends/statuses.rb`: Minor conflict due to glitch-soc's option to allow CWed toots in trends. Ported upstream changes.		2022-05-01 16:52:27 +02:00
..
chewy	Let votes statuses are also searchable (#18070)	2022-04-23 21:47:27 +02:00
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-01 16:52:27 +02:00
helpers	Merge branch 'main' into glitch-soc/merge-upstream	2022-04-04 17:25:57 +02:00
javascript	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-01 16:52:27 +02:00
lib	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-01 16:52:27 +02:00
mailers	Fix failure when sending warning emails with custom text (#17983)	2022-04-07 14:47:30 +02:00
models	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-01 16:52:27 +02:00
policies	Merge branch 'main' into glitch-soc/merge-upstream	2022-04-06 21:10:23 +02:00
presenters	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-08 20:22:54 +01:00
serializers	Merge branch 'main' into glitch-soc/merge-upstream	2022-04-25 17:09:32 +02:00
services	Merge branch 'main' into glitch-soc/merge-upstream	2022-04-28 23:41:53 +02:00
validators	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-01 16:52:27 +02:00
views	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-01 16:52:27 +02:00
workers	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-01 16:52:27 +02:00