Claire 6374937147 Merge commit 'e68b26c8df2056182564abcee230927ed53200c8' into glitch-soc/merge-upstream ... Conflicts: - `app/models/trends/statuses.rb`: Upstream added a date restriction to trendable posts, while glitch-soc had slightly different conditions. Added the date restriction to glitch-soc's conditions.		2024-11-24 16:46:28 +01:00
..
annotate_rb.rake	Change dependency from annotate to annotaterb (#30232)	2024-11-18 14:40:02 +00:00
assets.rake	Change how theme style packs are loaded	2024-04-28 15:45:41 +02:00
branding.rake	Fix `Rails/RootPathnameMethods` cop (#31582)	2024-08-26 07:35:07 +00:00
db.rake	Add further warnings about encryption secrets (#32476)	2024-10-14 13:00:20 +00:00
emojis.rake	Change some instances of Nokogiri HTML4 parsing to HTML5 (#31812)	2024-09-08 18:41:37 +00:00
glitchsoc.rake	Fix Ruby linting issue	2024-01-15 20:57:55 +01:00
icons.rake	Add detection and download of material_symbol icons in config/navigation.rb (#31366)	2024-10-01 12:49:04 +00:00
mastodon.rake	Fix “uninitialized constant HttpLog” errors in tootctl (#32796)	2024-11-07 09:57:42 +00:00
repo.rake	Fix “uninitialized constant HttpLog” errors in tootctl (#32796)	2024-11-07 09:57:42 +00: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
statistics.rake	Fix `mastodon:stats` decoration of stats rake task (#31104)	2024-07-23 06:51:57 +00:00
tests.rake	Update Rails to version 7.2.2 (#30391)	2024-11-07 14:58:20 +00:00
webpacker.rake	Upgrade to Yarn 4, remove support for Node 16 (#27073)	2023-11-08 10:57:21 +00:00