Claire 1399e9d863 Merge commit '6ee7c03b282663700b2e3f2f83b57b163aac2a35' into glitch-soc/merge-upstream ... Conflicts: - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream ran a lint fix on this file, but this file is different in glitch-soc because the feature was added much earlier. Ran the lint fix on our own version of the file.		2023-07-12 16:03:05 +02:00
..
v1	Merge commit '6ee7c03b282663700b2e3f2f83b57b163aac2a35' into glitch-soc/merge-upstream	2023-07-12 16:03:05 +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	Fix RSpec/StubbedMock cop (#25552)	2023-07-12 10:20:10 +02:00
oembed_controller_spec.rb	Fix RSpec/InferredSpecType cop (#24736)	2023-05-04 05:49:53 +02:00