Claire 9f92b05bd2 Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream ...

Conflicts:
- `README.md`:
  Upstream has updated their README but we have a completely different one.
  Kept our version of `README.md`

2023-12-10 18:05:02 +01:00

..

v1

Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream

2023-12-10 18:05:02 +01:00

v2

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

2023-10-13 14:42:09 +02: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