Claire 44a5f1b64a Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream ... Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore. - `README.md`: Upstream updated its README, but glitch-soc has a completely different one. Kept glitch-soc's README		2023-08-11 22:15:41 +02: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	Autofix Rubocop Style/RedundantBegin (#23703)	2023-02-19 07:09:40 +09:00
emojis.rake	Autofix Rubocop Regex Style rules (#23690)	2023-06-06 14:50:51 +02:00
glitchsoc.rake	Fix most rubocop issues (#2165)	2023-04-09 11:25:30 +02:00
mastodon.rake	Rubocop fix: Perfomance/UnfreezeString (#26217)	2023-07-28 23:11:05 +02:00
repo.rake	Fix Style/SlicingWithRange cop (#25923)	2023-07-12 10:03:06 +02:00
spec.rake	Add end-to-end (system) tests (#25461)	2023-07-28 23:09:49 +02:00
statistics.rake	Audofix Rubocop Style/WordArray (#23739)	2023-02-20 06:14:10 +01:00
tests.rake	Improve various queries against account domains (#25126)	2023-05-25 09:27:16 +02:00