Claire dd0002e1fe Merge commit '610cf6c3713e414995ea1a57110db400ccb88dd2' into glitch-soc/merge-upstream ... Conflicts: - `app/models/trends.rb`: Conflict due to glitch-soc's code splitting trends mailing depending on type. Ported upstream's changes.		2023-07-12 15:38:35 +02:00
..
v1	Merge commit '610cf6c3713e414995ea1a57110db400ccb88dd2' into glitch-soc/merge-upstream	2023-07-12 15:38:35 +02:00
v2	Fix `/api/v2/search` not working with following query param (#25681)	2023-07-03 18:06:57 +02:00
web	Fix `RSpec/VerifiedDoubles` cop (#25469)	2023-06-22 14:55:22 +02:00
base_controller_spec.rb	…
oembed_controller_spec.rb	…