Claire a3b6a85521 Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream ... Conflicts: - `.prettierignore`: Conflict due to glitch-soc-only files. Kept those at the end of the file.		2024-01-13 12:11:29 +01:00
..
chewy	…
config/initializers/rack	…
controllers	Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream	2024-01-13 12:11:29 +01:00
fabrication	…
fabricators	Move followable_by coverage to suggestions (#28697)	2024-01-12 09:11:34 +00:00
features	Use Sidekiq `fake!` instead of `inline!` in specs (#25369)	2024-01-10 11:06:58 +00:00
fixtures	…
generators	…
helpers	Merge branch 'main' into glitch-soc/merge-upstream	2023-12-28 16:57:10 +01:00
lib	Merge commit '0a7cff53c2577b3e79599e069eeb344f2613ad8d' into glitch-soc/merge-upstream	2024-01-11 13:24:20 +01:00
locales	…
mailers	…
models	Merge commit 'cd37048439f9b324f48e6af1f426a7894c54b4da' into glitch-soc/merge-upstream	2024-01-13 12:11:29 +01:00
policies	…
presenters	Merge branch 'main' into glitch-soc/merge-upstream	2023-12-28 16:57:10 +01:00
requests	Merge commit '2954279e9c630a9d146575bf600978dc6c5279bd' into glitch-soc/merge-upstream	2024-01-11 20:15:19 +01:00
routing	…
search/models/concerns/account	Use Sidekiq `fake!` instead of `inline!` in specs (#25369)	2024-01-10 11:06:58 +00:00
serializers	…
services	Use Sidekiq `fake!` instead of `inline!` in specs (#25369)	2024-01-10 11:06:58 +00:00
support	Move streaming `around` config into manager class (#28684)	2024-01-11 10:54:42 +00:00
system	Use Sidekiq `fake!` instead of `inline!` in specs (#25369)	2024-01-10 11:06:58 +00:00
validators	Merge commit 'fe2667bb0d3487a32b9da5250402a90482a85fe2' into glitch-soc/merge-upstream	2024-01-10 17:51:12 +01:00
views	…
workers	Use Sidekiq `fake!` instead of `inline!` in specs (#25369)	2024-01-10 11:06:58 +00:00
rails_helper.rb	Move streaming `around` config into manager class (#28684)	2024-01-11 10:54:42 +00:00
spec_helper.rb	…