Claire 297eb7c956 Merge commit '4bd969e4bb54297981d385903bf8a4348b394f09' into glitch-soc/merge-upstream ...

Conflicts:
- `CONTRIBUTING.md`:
  Upstream modified it while we quote upstream's within an otherwise different file.
  Applied upstream's changes.

2025-01-18 12:42:17 +01: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

Change some instances of Nokogiri HTML4 parsing to HTML5 (#31812)

2024-09-08 18:41:37 +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

Move clear environment portion of mastodon:setup to private method (#33616)

2025-01-16 15:45:02 +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

…