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
..
chewy	…
config/initializers	…
controllers	Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream	2023-12-10 18:05:02 +01:00
fabrication	…
fabricators	…
features	Fix confusing screen when visiting a confirmation link for an already-confirmed email (#27368)	2023-10-25 21:33:44 +00:00
fixtures	…
generators	Rails 7.1 update (#25963)	2023-10-23 17:58:29 +00:00
helpers	Merge commit '9f218c9924b883207a3463a29314c92032cf06df' into glitch-soc/merge-upstream	2023-10-19 19:14:04 +02:00
lib	Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream	2023-10-24 19:59:19 +02:00
locales	…
mailers	Misc spec/refactor to user mailer and user mailer spec (#27486)	2023-10-27 09:57:16 +00:00
models	Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream	2023-12-10 18:05:02 +01:00
policies	…
presenters	…
requests	Merge commit '2e6bf60f1549e5c1f1cfea2d614f978bea17b8a2' into glitch-soc/merge-upstream	2023-12-10 18:05:02 +01:00
routing	…
search/models/concerns	…
serializers	…
services	Handle featured collections without items (#27581)	2023-10-27 02:36:22 +00:00
support	…
system	…
validators	Merge commit '935d54124e80e9fe5365c724e5c8827a2b3ed5b3' into glitch-soc/merge-upstream	2023-10-17 21:42:49 +02:00
views	Configure brakeman to ignore url safe preview card urls (#25883)	2023-10-20 15:32:16 +02:00
workers	…
rails_helper.rb	…
spec_helper.rb	Fix duplicate github annotations for rspec failures (#27450)	2023-10-18 10:18:34 +02:00