Claire c96eebde37 Merge commit 'ded7f50f2c2672879292ff571b2e531ea87f77e4' into glitch-soc/merge-4.5 ...

Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
  Upstream refactored a bit where we had an extra argument for markdown/HTML.
  Adapted upstream change.

2026-01-19 18:29:02 +01: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 '1dead10312caa0cc7719cb80052af549ddf3e6a1' into glitch-soc/merge-upstream

2025-10-28 20:25:09 +01:00

fabrication

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

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

fabricators

Implement FEP 7888: Part 1 - publish conversation context (#35959)

2025-09-05 19:28:29 +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 '591df1f205c654381203b56d46498efc62370776' into glitch-soc/merge-upstream

2025-08-01 22:11:59 +02:00

lib

Merge commit 'ded7f50f2c2672879292ff571b2e531ea87f77e4' into glitch-soc/merge-4.5

2026-01-19 18:29:02 +01:00

locales

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

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

mailers

Fix SMTP configuration with mail 2.9.0 (#36646)

2025-10-31 14:09:36 +01:00

models

Merge commit '86cff1abca6af7ffb1a6ca004ae308c0df6d45ba' into glitch-soc/merge-4.5

2025-12-08 16:37:11 +01:00

policies

Merge commit '75fca715e9ae8ad347edbaf6511a052f161a3de3' into glitch-soc/merge-upstream

2025-09-02 19:07:51 +02:00

presenters

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

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

requests

Merge commit 'ded7f50f2c2672879292ff571b2e531ea87f77e4' into glitch-soc/merge-4.5

2026-01-19 18:29:02 +01: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

Fix quotes with CWs but no text not having fallback link (#37361)

2026-01-06 14:11:56 +01:00

services

Fix mentions of domain-blocked users being processed (#37257)

2025-12-19 11:02:32 +01:00

support

Replace ThreadingHelper wait loop with functional CyclicBarrier (#36508)

2025-10-20 10:10:43 +00:00

system

Fix tests on glitch-soc

2025-10-28 20:39:10 +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