Claire cd2ee0ec5f Merge commit '757d7c73c0ca3750ac9e74a7e962f71c535a7bd0' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated its README, we have a completely different one. Kept ours. - `yarn.lock`: Upstream changed from yarn 1 to yarn 4, but we had some different dependencies. Updated to yarn 4 and re-added our dependencies.		2023-12-18 18:25:33 +01:00
..
assets.rake	…
auto_annotate_models.rake	…
branding.rake	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	2023-07-12 09:47:08 +02:00
db.rake	…
emojis.rake	…
glitchsoc.rake	…
mastodon.rake	Merge commit '8b770ce8110e6cd609a6769c66210d95e291e3e5' into glitch-soc/merge-upstream	2023-10-24 19:17:20 +02:00
repo.rake	Fix `repo:changelog` task matching strings that are not Pull Request identifiers (#26280)	2023-08-14 18:47:43 +02:00
spec.rake	Add search tests (#26703)	2023-09-08 16:17:55 +02:00
statistics.rake	…
tests.rake	Add migration tests for negative settings (#27012)	2023-09-21 12:33:30 +02:00
webpacker.rake	Upgrade to Yarn 4, remove support for Node 16 (#27073)	2023-11-08 10:57:21 +00:00