Claire 5321a553d5 Merge commit 'aa04efb92a47cf27c1aafb2aeb21584e91c526ac' into glitch-soc/merge-upstream ...

Conflicts:
- `app/models/user_settings.rb`:
  Not a real conflict, upstream added a setting on a line adjacent to a
  glitch-soc-only line.
  Added upstream's new setting.

2025-05-14 13:38:23 +02:00

..

annotate_rb.rake

Change dependency from annotate to annotaterb (#30232)

2024-11-18 14:40:02 +00:00

assets.rake

…

branding.rake

Fix Rails/RootPathnameMethods cop (#31582)

2024-08-26 07:35:07 +00:00

db.rake

Further harden the warnings against changing encryption secrets (#33631)

2025-01-17 10:42:52 +00:00

emojis.rake

Fix libvips being unconditionally required by tasks (#34620)

2025-05-06 09:45:32 +00:00

glitchsoc.rake

…

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 tootctl accounts create failing because of date-of-birth check (#34663)

2025-05-12 09:28:12 +00:00

repo.rake

Fix “uninitialized constant HttpLog” errors in tootctl (#32796)

2024-11-07 09:57:42 +00:00

sidekiq_unique_jobs.rake

…

tests.rake

Update Rails to version 7.2.2 (#30391)

2024-11-07 14:58:20 +00:00

webpacker.rake

…