Claire fc1dd81ea5 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Not a real conflict, upstream dependency updated textually too close to a glitch-soc-only dependency. Updated the upstream dependency.		2022-04-27 08:48:21 +02:00
..
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2022-04-06 21:10:23 +02:00
fabricators	Fix report category not being saved in REST API (#17682)	2022-03-02 18:57:08 +01:00
features	Add submit button to the top of preferences pages (#13068)	2020-03-08 16:04:03 +01:00
fixtures	Fix some link previews being incorrectly generated from other prior links (#16885)	2021-10-21 20:39:35 +02:00
helpers	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-08 20:22:54 +01:00
lib	Merge branch 'main' into glitch-soc/merge-upstream	2022-04-27 08:48:21 +02:00
mailers	Fix failure when sending warning emails with custom text (#17983)	2022-04-07 14:47:30 +02:00
models	Revert support from loading Home timeline from database	2022-04-19 15:06:38 +02:00
policies	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-08 20:22:54 +01:00
presenters	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-08 20:22:54 +01:00
requests	Further preparation for Rails 6 (#15916)	2021-03-19 02:45:34 +01:00
routing
serializers/activitypub	Fix account URI in UpdatePollSerializer (#11194)	2019-06-27 19:41:55 +02:00
services	Merge branch 'main' into glitch-soc/merge-upstream	2022-04-06 21:10:23 +02:00
support	Spelling (#17705)	2022-03-06 22:51:40 +01:00
validators	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-30 15:02:56 +02:00
views	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-04 01:07:49 +01:00
workers	Improve tests involving push_bulk (#17508)	2022-02-10 19:42:45 +01:00
rails_helper.rb	Fix not updating a status when newer version is fetched manually (#17745)	2022-03-12 09:11:36 +01:00
spec_helper.rb	Improve tests involving push_bulk (#17508)	2022-02-10 19:42:45 +01:00