Claire 15929a3d59 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Our README is completely different. Discarded upstream changes. - `app/javascript/packs/mailer.js`: We had removed the file. Move the changes to `app/javascript/core/mailer.js`.		2022-06-11 00:08:41 +02:00
..
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-02 09:49:38 +02:00
fabricators	Add administrative webhooks (#18510)	2022-06-09 21:57:36 +02:00
features	Add submit button to the top of preferences pages (#13068)	2020-03-08 16:04:03 +01:00
fixtures	Allow import/export of instance-level domain blocks/allows (#1754)	2022-05-16 09:29:01 +02:00
helpers	Change brand color and logotypes (#18592)	2022-06-09 22:25:23 +02:00
lib	Add test	2022-05-24 10:26:04 +02:00
mailers	Fix failure when sending warning emails with custom text (#17983)	2022-04-07 14:47:30 +02:00
models	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-10 11:51:43 +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-06-02 09:49:38 +02:00
requests	Further preparation for Rails 6 (#15916)	2021-03-19 02:45:34 +01:00
routing	Move create/destroy actions for api/v1/statuses to namespace (#3678)	2017-06-10 09:39:26 +02:00
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-05-24 13:59:21 +02:00
support	Spelling (#17705)	2022-03-06 22:51:40 +01:00
validators	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-10 11:51:43 +02:00
views	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-04 01:07:49 +01:00
workers	Fix single Redis connection being used across all threads (#18135)	2022-04-28 17:47:34 +02:00
rails_helper.rb	Fix single Redis connection being used across all threads (#18135)	2022-04-28 17:47:34 +02:00
spec_helper.rb	Improve tests involving push_bulk (#17508)	2022-02-10 19:42:45 +01:00