Claire e08c8b6933 Merge commit 'b48f907b20e2c9909665a484041845697d26f17c' into glitch-soc/merge-upstream ...

Conflicts:
- `app/helpers/settings_helper.rb`:
  Upstream added a new helper.
  Conflict caused by the fact there is a glitch-soc specific helper.
  Added upstream's new helper in addition to glitch-soc's.

2026-06-09 21:30:54 +02:00

..

admin

Add have_attachment matcher for attached file exports (#38389)

2026-03-25 13:18:14 +00:00

api

…

auth

Use more granular content check via parsed_body (#38378)

2026-03-25 09:58:04 +00:00

concerns

Update rubocop-rspec to version 3.10.1 (#39303)

2026-06-08 15:27:34 +00:00

settings

Merge commit '664efcf4c3f9713894054fb642a252d8752a4123' into glitch-soc/merge-upstream

2026-03-25 21:09:30 +01:00

application_controller_spec.rb

Merge commit '1d46558e8d949860acc4f3a86516b9989bd74f79' into glitch-soc/merge-upstream

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

authorize_interactions_controller_spec.rb

…

follower_accounts_controller_spec.rb

Add coverage for blocked account scenario in following/followers (#36042)

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

following_accounts_controller_spec.rb

Add coverage for blocked account scenario in following/followers (#36042)

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

relationships_controller_spec.rb

…