Claire e53421b548 Merge commit 'e5826777b6c06a32b97388657beaca1e5eccb421' into glitch-soc/merge-upstream ...

Conflicts:
- `config/settings.yml`:
  Not a real conflict, upstream removed settings that are identical in glitch-soc
  but textually adjacent to glitch-soc-only settings.
  Removed what upstream removed.

2025-07-30 20:05:45 +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

configuration

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

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

controllers

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

2025-07-25 21:45:00 +02:00

fabrication

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

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

fabricators

Add ability to block words in usernames (#35407)

2025-07-29 10:19:15 +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 'e5826777b6c06a32b97388657beaca1e5eccb421' into glitch-soc/merge-upstream

2025-07-30 20:05:45 +02:00

lib

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

2025-07-30 20:05:45 +02:00

locales

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

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

mailers

Add optional bulk mailer settings (#35203)

2025-06-30 14:49:14 +00:00

models

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

2025-07-30 20:05:45 +02:00

policies

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

2025-07-25 21:45:00 +02:00

presenters

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

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

requests

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

2025-07-30 20:05:45 +02:00

routing

Update rubocop to version 1.79.0 (#35502)

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

search/models/concerns/account

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

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

serializers

Add experimental basic quote post authoring (#35355)

2025-07-25 12:35:24 +00:00

services

Add experimental basic quote post authoring (#35355)

2025-07-25 12:35:24 +00:00

support

Extract User::Activity concern (#35581)

2025-07-30 11:19:11 +00:00

system

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

2025-07-30 20:05:45 +02: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

Add experimental basic quote post authoring (#35355)

2025-07-25 12:35:24 +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