Claire a3b6a85521 Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream ... Conflicts: - `.prettierignore`: Conflict due to glitch-soc-only files. Kept those at the end of the file.		2024-01-13 12:11:29 +01:00
..
assets.rake	…
auto_annotate_models.rake	…
branding.rake	…
db.rake	…
emojis.rake	Add new emojis from `jdecked/twemoji` 15.0 (#28404)	2024-01-11 16:15:08 +00:00
glitchsoc.rake	…
mastodon.rake	Fix `Rails/I18nLocaleTexts` cop (#27779)	2023-11-09 09:46:39 +00: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	Configure elastic search integration with rspec tag (#27882)	2023-11-17 11:52:20 +00:00
statistics.rake	…
tests.rake	Fix ISO code for Canadian French (#26015)	2024-01-09 10:56:13 +00:00
webpacker.rake	Upgrade to Yarn 4, remove support for Node 16 (#27073)	2023-11-08 10:57:21 +00:00