Claire 2810231180 Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Upstream renamed a helper method everywhere. There was one glitch-soc line involving changes because of the local-only post feature. Ported upstream's change.		2024-05-16 19:30:10 +02:00
..
chewy	Add new public status index (#26344)	2023-08-24 16:40:04 +02:00
config/initializers/rack	Use unchanging github links in docs/comments (#29545)	2024-03-11 15:14:55 +00:00
controllers	Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream	2024-05-16 19:30:10 +02:00
fabrication	Ensure unique values in fabricators (#29515)	2024-03-11 08:53:24 +00:00
fabricators	Use fabrication sequence in domain values (#29895)	2024-04-11 08:59:01 +00:00
fixtures	Add end-to-end test for OCR in media uploads (#29148)	2024-02-08 19:13:44 +00:00
generators	Fix flaky tests related to file creation (#28248)	2023-12-06 22:22:25 +00:00
helpers	Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' into glitch-soc/merge-upstream	2024-05-16 19:30:10 +02:00
lib	Merge commit '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream	2024-05-06 17:53:51 +02:00
locales	Replace i18n view spec with helper spec (#24966)	2023-05-15 17:25:04 +02:00
mailers	Add stub for trending tags in user mailer spec (#29850)	2024-04-05 07:48:07 +00:00
models	Merge commit '2fe1b8d1695d8faa452a69872fde94ccc4611576' into glitch-soc/merge-upstream	2024-05-06 17:53:51 +02:00
policies	Merge commit '98b5f85f10a3af50a54fcd79e09fc9fd88f774fa' into glitch-soc/merge-upstream	2024-01-15 20:53:16 +01:00
presenters	Merge branch 'main' into glitch-soc/merge-upstream	2023-12-28 16:57:10 +01:00
requests	Merge commit '1959365c2f410aa82874c5c05ab92c4eca4c4055' into glitch-soc/merge-upstream	2024-05-11 22:10:56 +02:00
routing	Enable Style/FrozenStringLiteralComment for specs (#23790)	2023-02-22 09:55:31 +09:00
search/models/concerns/account	Use enum-generated public_visibility scope on Status (#28156)	2024-03-14 09:31:57 +00:00
serializers	Add max_pinned_statuses to instances serializer and api response (#29441)	2024-04-02 13:54:11 +00:00
services	Fix Idempotency-Key ignored when scheduling a post (#30084)	2024-04-26 13:19:02 +00:00
support	Consolidate system specs into single directory, use rspec tags for configuration (#30206)	2024-05-10 12:36:09 +00:00
system	Consolidate system specs into single directory, use rspec tags for configuration (#30206)	2024-05-10 12:36:09 +00:00
validators	Status length validation spec updates (#30132)	2024-05-02 08:31:06 +00:00
views	Merge commit '0622107449e72d35b22afeeba2f0ba983e914803' into glitch-soc/merge-upstream	2024-05-01 19:16:48 +02:00
workers	Retain unconfirmed users longer (1 week) (#30285)	2024-05-15 08:27:34 +00:00
rails_helper.rb	Move simplecov config into rails_helper (#30302)	2024-05-15 09:33:36 +00:00
spec_helper.rb	Move simplecov config into rails_helper (#30302)	2024-05-15 09:33:36 +00:00