Claire bc33be0342 Merge commit '23e32a4b3031d1da8b911e0145d61b4dd47c4f96' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Conflict because we had updated the `json-ld` gem to fix a yanked dependency. Kept our version of `json-ld` while updating other dependencies.		2023-12-18 18:07:24 +01:00
..
chewy	Fix #hashtag matching non-hashtagged posts in search (#26781)	2023-09-04 10:18:45 +02:00
controllers	Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream	2023-12-17 23:04:16 +01:00
helpers	Merge commit '23e32a4b3031d1da8b911e0145d61b4dd47c4f96' into glitch-soc/merge-upstream	2023-12-18 18:07:24 +01:00
javascript	Merge commit '23e32a4b3031d1da8b911e0145d61b4dd47c4f96' into glitch-soc/merge-upstream	2023-12-18 18:07:24 +01:00
lib	Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream	2023-12-17 23:04:16 +01:00
mailers	Misc spec/refactor to user mailer and user mailer spec (#27486)	2023-10-27 09:57:16 +00:00
models	Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream	2023-12-17 23:04:16 +01: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 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream	2023-12-17 23:04:16 +01:00
services	Merge commit 'f476d9dab2f5cca6ae44b95961df6b6557d66dab' into glitch-soc/merge-upstream	2023-12-17 23:04:16 +01:00
validators	Merge commit '935d54124e80e9fe5365c724e5c8827a2b3ed5b3' into glitch-soc/merge-upstream	2023-10-17 21:42:49 +02:00
views	Merge commit '23e32a4b3031d1da8b911e0145d61b4dd47c4f96' into glitch-soc/merge-upstream	2023-12-18 18:07:24 +01:00
workers	Merge commit '3bf896c973404261f4f7b25c25ea22adb1a85e7d' into glitch-soc/main	2023-12-17 17:43:30 +01:00