Claire bd9e7d6060 Merge commit '68984de5b503791b814d81a85520af256bf43e11' into glitch-soc/merge-upstream ...

Conflicts:
- `app/views/admin/settings/discovery/show.html.haml`:
  Glitch-soc has an extra setting textually adjacent to a line upstream has changed.
  Applied upstream's change while keeping glitch-soc's setting.

2026-03-17 18:53:00 +01:00

..

chewy

Add InstancesIndex coverage (#38129)

2026-03-10 14:45:17 +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 '1d46558e8d949860acc4f3a86516b9989bd74f79' into glitch-soc/merge-upstream

2026-03-09 18:14:15 +01:00

fabrication

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

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

fabricators

Add column for html descriptions of collections (#38124)

2026-03-10 14:54:38 +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 'c37bc5a8a94758e19b2d50db5e7816a96cec5cf4' into glitch-soc/merge-upstream

2026-03-17 18:01:07 +01:00

lib

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

2026-03-17 18:01:07 +01:00

locales

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

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

mailers

Replace email_spec gem with built-in matchers (#38079)

2026-03-05 14:42:21 +00:00

models

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

2026-03-17 18:01:07 +01:00

policies

Merge commit '74b3b6c798d1f137947e80df8eefb7412e70febd' into glitch-soc/merge-upstream

2026-03-02 18:11:45 +01:00

presenters

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

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

requests

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

2026-03-17 18:01:07 +01:00

routing

Update rubocop to version 1.79.0 (#35502)

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

search/models/concerns/account

Clean up search tagged specs (#38085)

2026-03-10 09:46:03 +00:00

serializers

Add serializers for Accept+Reject of feature requests (#38177)

2026-03-12 15:46:36 +00:00

services

Rescue JSON::ParserError where already converted (#38244)

2026-03-17 08:57:10 +00:00

support

Update model-concern-related spec locations for consistency (#38200)

2026-03-17 09:50:32 +00:00

system

Merge commit '68984de5b503791b814d81a85520af256bf43e11' into glitch-soc/merge-upstream

2026-03-17 18:53:00 +01:00

validators

Remove message argument from NoteLengthValidator error approach (#37977)

2026-03-05 17:44:52 +00:00

views

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

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

workers

Use JSON.generate in trivial string/hash conversion in specs (#38224)

2026-03-16 15:16:43 +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 InstancesIndex coverage (#38129)

2026-03-10 14:45:17 +00:00

spec_helper.rb

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

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