Claire 93bdb16817 Merge commit '8ba1487f30685fff4555a7537d3e6c765c73a07c' into glitch-soc/merge-upstream ...

Conflicts:
- `spec/models/concerns/account/interactions_spec.rb`:
  Conflict due to glitch-soc having modified specs ages ago.
  The covered code is the same as upstream, though.
  Took upstream's version of the specs.
- `spec/models/status_spec.rb`:
  Conflict because glitch-soc tests for an extra glitch-soc-specific
  method.
  Added upstream's changes while keeping the glitch-soc method.

2025-06-24 22:43:43 +02:00

..

chewy

Enable "zero monkey patching" mode in RSpec (#31614)

2024-09-04 05:12:25 +00:00

config/initializers/rack

Enable "zero monkey patching" mode in RSpec (#31614)

2024-09-04 05:12:25 +00:00

controllers

Merge commit '71d4ce1c228bab470fa9d3bcb5a130cf53665103' into glitch-soc/merge-upstream

2025-06-13 18:07:59 +02:00

fabrication

Enable "zero monkey patching" mode in RSpec (#31614)

2024-09-04 05:12:25 +00:00

fabricators

Add FASP follow recommendation support (#34964)

2025-06-16 10:43:27 +00:00

fixtures

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

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

generators

Enable "zero monkey patching" mode in RSpec (#31614)

2024-09-04 05:12:25 +00:00

helpers

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

2025-06-16 20:08:52 +02:00

lib

Merge commit '71d4ce1c228bab470fa9d3bcb5a130cf53665103' into glitch-soc/merge-upstream

2025-06-13 18:07:59 +02:00

locales

Enable "zero monkey patching" mode in RSpec (#31614)

2024-09-04 05:12:25 +00:00

mailers

Allow more flexible host/port treatment with LOCAL_DOMAIN values in tests (#35040)

2025-06-16 13:12:23 +00:00

models

Merge commit '8ba1487f30685fff4555a7537d3e6c765c73a07c' into glitch-soc/merge-upstream

2025-06-24 22:43:43 +02:00

policies

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

2025-04-25 17:22:10 +02:00

presenters

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

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

requests

Merge commit '8ba1487f30685fff4555a7537d3e6c765c73a07c' into glitch-soc/merge-upstream

2025-06-24 22:43:43 +02:00

routing

Extend custom CSS cache time with digest paths (#33207)

2025-01-08 08:48:45 +00:00

search/models/concerns/account

Enable "zero monkey patching" mode in RSpec (#31614)

2024-09-04 05:12:25 +00:00

serializers

Use config_for for VAPID key storage (#34845)

2025-05-30 07:00:33 +00:00

services

Move "limited federation mode" config to x.mastodon area (#35041)

2025-06-16 06:13:03 +00:00

support

Allow more flexible host/port treatment with LOCAL_DOMAIN values in tests (#35040)

2025-06-16 13:12:23 +00:00

system

Merge commit '8ba1487f30685fff4555a7537d3e6c765c73a07c' into glitch-soc/merge-upstream

2025-06-24 22:43:43 +02:00

validators

Add age verification on sign-up (#34150)

2025-03-14 14:07:29 +00:00

views

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

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

workers

Allow more flexible host/port treatment with LOCAL_DOMAIN values in tests (#35040)

2025-06-16 13:12:23 +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

Update sidekiq to version 7 (#34745)

2025-05-26 15:32:41 +00:00

spec_helper.rb

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

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