Claire f1a6f9062e Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/api/v1/statuses_controller.rb`: Upstream moved things around in a place where glitch-soc had support for an extra parameter (`content_type`). Follow upstream but reintroduce `content_type`.		2022-02-10 19:09:27 +01:00
..
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-10 19:09:27 +01:00
fabricators	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +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-02-09 17:28:33 +01:00
lib	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-08 18:23:53 +01:00
mailers	Refactor and improve tests (#17386)	2022-01-28 00:46:42 +01:00
models	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-28 08:58:32 +01:00
policies	Merge branch 'main' into glitch-soc/merge-upstream	2022-02-10 19:09:27 +01:00
presenters	Change references to tootsuite/mastodon to mastodon/mastodon (#16491)	2021-07-13 15:46:20 +02: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-02-10 19:09:27 +01:00
support	Fix base64-encoded file uploads not being possible (#12748)	2020-01-04 01:54:07 +01:00
validators	Merge branch 'main' into glitch-soc/merge-upstream	2022-01-17 08:28:52 +01:00
views	Merge branch 'main' into glitch-soc/merge-upstream	2021-10-13 15:50:24 +02:00
workers	Fix NoMethodError in StatusUpdateDistributionWorker (#17499)	2022-02-10 14:57:10 +01:00
rails_helper.rb	Add WebAuthn as an alternative 2FA method (#14466)	2020-08-24 16:46:27 +02:00
spec_helper.rb	Move rspec examples to tmp dir (#12539)	2019-12-02 19:55:08 +01:00