Claire b474cbbd28 Merge commit '7840c6b75b61e64d89d7fd9f291277fb177e513f' into glitch-soc/merge-upstream ...

Conflicts:
- `app/controllers/api/v1/accounts/relationships_controller.rb`:
  We differed by listing suspended users when requesting relationships.
  Updated to upstream's code.

2023-12-18 18:40:58 +01:00

..

v1

Merge commit '7840c6b75b61e64d89d7fd9f291277fb177e513f' into glitch-soc/merge-upstream

2023-12-18 18:40:58 +01:00

v2

Fix Lint/EmptyBlock cop (#27748)

2023-11-07 09:11:04 +00:00

web

Fix embed dropdown menu item for unauthenticated users (#25964)

2023-07-13 15:53:03 +02:00

base_controller_spec.rb

Fix RSpec/StubbedMock cop (#25552)

2023-07-12 10:20:10 +02:00

oembed_controller_spec.rb

DB speedup in API:: controller/request specs (#25516)

2023-10-13 14:42:09 +02:00