Claire 7839c8d9af Merge commit 'cc3c7ba532f75617505bb41297651a5c14f71bdd' into glitch-soc/merge-upstream ...

Conflicts:
- `app/helpers/theme_helper.rb`:
  Upstream simplified `theme_style_tags`. Our version is different because of
  the different theming system.
  Adapted upstream's changes.
- `app/views/layouts/error.html.haml`:
  Theming system.

2026-01-16 23:22:19 +01:00

..

chewy

…

config/initializers/rack

…

configuration

Fix support for special characters in various environment variables (#35314)

2025-07-09 08:58:41 +00:00

controllers

Merge commit '53be8392eceea8c3a576478e209fe82c2ceb458a' into glitch-soc/merge-upstream

2025-12-16 18:27:03 +01:00

fabrication

…

fabricators

AP/AS serialization of Collections (#37434)

2026-01-12 08:39:25 +00:00

fixtures

Remove unused "oversized" spec fixture PNG file (#33881)

2025-02-11 06:45:27 +00:00

generators

…

helpers

Merge commit 'cc3c7ba532f75617505bb41297651a5c14f71bdd' into glitch-soc/merge-upstream

2026-01-16 23:22:19 +01:00

lib

Merge commit '10de65e41c3b01bd938f97fdb60fc96c26673966' into glitch-soc/merge-upstream

2026-01-14 20:31:42 +01:00

locales

…

mailers

Fix SMTP configuration with mail 2.9.0 (#36646)

2025-10-30 11:21:32 +00:00

models

Merge commit 'ed17b3a7ec52c0421ae2483a8e08431316f08b1c' into glitch-soc/merge-upstream

2026-01-12 21:00:14 +01:00

policies

Merge commit '10de65e41c3b01bd938f97fdb60fc96c26673966' into glitch-soc/merge-upstream

2026-01-14 20:31:42 +01:00

presenters

Merge commit 'e1d7efadc04dd0826c6bcfe43325688566e13881' into glitch-soc/merge-upstream

2025-01-14 20:38:32 +01:00

requests

Merge commit 'bc2f8a358f96a9540e6f39bb1c58273deb4545de' into glitch-soc/merge-upstream

2026-01-15 18:02:35 +01:00

routing

Update rubocop to version 1.79.0 (#35502)

2025-07-25 07:22:05 +00:00

search/models/concerns/account

…

serializers

AP/AS serialization of Collections (#37434)

2026-01-12 08:39:25 +00:00

services

Federated "featureable in collections" preference (#37298)

2025-12-19 13:44:27 +00:00

support

Add details to JS browser error spec failure helpers (#37441)

2026-01-12 09:38:00 +00:00

system

Merge commit '7e634eecbc5dc2f65b7bdbfc5c2b5c8a0955156d' into glitch-soc/merge-upstream

2026-01-06 18:11:26 +01:00

validators

Add ability to block words in usernames (#35407)

2025-07-29 10:19:15 +00:00

views

Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream

2024-11-15 18:44:32 +01:00

workers

Fix scheduled quote posts being posted as non-quote posts (#36550)

2025-10-21 16:00:40 +00:00

flatware_helper.rb

Switch coverage generation default to false, allow opt in with COVERAGE env var (#33824)

2025-02-04 11:14:45 +00:00

rails_helper.rb

Add integration tests for mastodon-streaming (#36025)

2025-09-30 07:27:09 +00:00

spec_helper.rb

Use likes and shares totalItems on status creations and updates (#32620)

2024-10-28 04:55:18 +00:00