Claire 6e9f89e5b6 Merge commit 'c85e0a6b047f1a72ad970bc04c4e1be3f028b3d1' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/admin.jsx`: Upstream fixed `@rails/ujs` imports. Already taken care of in 8a131fb7bc - `app/javascript/packs/public.jsx`: Upstream fixed `@rails/ujs` imports. Already taken care of in 8a131fb7bc		2023-10-25 12:18:45 +02:00
..
chewy	Fix #hashtag matching non-hashtagged posts in search (#26781)	2023-09-04 10:18:45 +02:00
controllers	Merge commit '379115e601361c2b5da775fbf28b7dff9dc02e71' into glitch-soc/merge-upstream	2023-10-24 19:31:14 +02:00
helpers	Merge commit '379115e601361c2b5da775fbf28b7dff9dc02e71' into glitch-soc/merge-upstream	2023-10-24 19:31:14 +02:00
javascript	Merge commit 'c85e0a6b047f1a72ad970bc04c4e1be3f028b3d1' into glitch-soc/merge-upstream	2023-10-25 12:18:45 +02:00
lib	Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream	2023-10-24 19:59:19 +02:00
mailers	Add admin notifications for new Mastodon versions (#26582)	2023-09-01 17:47:07 +02:00
models	Merge commit '15182d1e5e595b21c47b48c5d258f30a0251e753' into glitch-soc/merge-upstream	2023-10-24 20:31:20 +02:00
policies	Merge commit '5a437edc7f22d5797e5af29d9b450a03eccec304' into glitch-soc/merge-upstream	2023-10-08 17:05:40 +02:00
presenters	Add admin notifications for new Mastodon versions (#26582)	2023-09-01 17:47:07 +02:00
serializers	Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream	2023-10-19 19:14:04 +02:00
services	Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream	2023-10-19 19:14:04 +02:00
validators	Merge commit '935d54124e80e9fe5365c724e5c8827a2b3ed5b3' into glitch-soc/merge-upstream	2023-10-17 21:42:49 +02:00
views	Merge commit 'c85e0a6b047f1a72ad970bc04c4e1be3f028b3d1' into glitch-soc/merge-upstream	2023-10-25 12:18:45 +02:00
workers	Merge commit '379115e601361c2b5da775fbf28b7dff9dc02e71' into glitch-soc/merge-upstream	2023-10-24 19:31:14 +02:00