Claire ef3d15554b Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Changes were already cherry-picked and updated further in glitch-soc. Kept glitch-soc's version. - `README.md`: Upstream updated its README, we have a completely different one. Kept glitch-soc's README. - `app/models/account.rb`: Not a real conflict, upstream updated some lines textually adjacent to glitch-soc-specific lines. Ported upstream's changes.		2024-02-24 14:46:14 +01:00
..
assets.rake	Fix most rubocop issues (#2165)	2023-04-09 11:25:30 +02:00
auto_annotate_models.rake	Autofix Rubocop remaining Layout rules (#23679)	2023-02-20 06:58:28 +01:00
branding.rake	Enable Rubocop Style/FrozenStringLiteralComment (#23793)	2023-07-12 09:47:08 +02:00
db.rake	Update pre_migration_check postgres version requirement (#28800)	2024-01-19 11:20:20 +00:00
emojis.rake	Add new emojis from jdecked/twemoji 15.0 (#28404)	2024-01-11 16:15:08 +00:00
glitchsoc.rake	Fix Ruby linting issue	2024-01-15 20:57:55 +01:00
icons.rake	Add a new @/ alias for the root frontend directory and use it where possible (#28753)	2024-01-16 10:27:26 +00:00
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
sidekiq_unique_jobs.rake	Add sidekiq_unique_jobs:delete_all_locks task and disable sidekiq-unique-jobs UI by default (#29199)	2024-02-14 13:42:15 +01:00
spec.rake	Add JS console errors check (#28682)	2024-01-12 09:12:31 +00:00
statistics.rake	Audofix Rubocop Style/WordArray (#23739)	2023-02-20 06:14:10 +01:00
tests.rake	Move "everyone" role and "instance actor" account magic number IDs to constants (#29260)	2024-02-19 11:09:43 +00:00
webpacker.rake	Upgrade to Yarn 4, remove support for Node 16 (#27073)	2023-11-08 10:57:21 +00:00