tykayn aa4b715513 Merge remote-tracking branch 'glitch-soc/main' ... # Conflicts: # app/controllers/concerns/sign_in_token_authentication_concern.rb # app/javascript/mastodon/features/compose/components/action_bar.js # app/javascript/mastodon/features/compose/index.js		2022-05-10 10:17:24 +02:00
..
controllers	Merge remote-tracking branch 'glitch-soc/main'	2022-05-10 10:17:24 +02:00
fabricators	up from glitch	2022-03-29 10:14:34 +02:00
features	Add submit button to the top of preferences pages (#13068)	2020-03-08 16:04:03 +01:00
fixtures	Change references to tootsuite/mastodon to mastodon/mastodon (#16491)	2021-11-05 23:46:24 +01:00
helpers	up from glitch	2022-03-29 10:14:34 +02:00
lib	Merge branch 'main' into glitch-soc/merge-upstream	2022-04-28 18:16:42 +02:00
mailers	Fix failure when sending warning emails with custom text (#17983)	2022-04-07 14:47:30 +02:00
models	Merge remote-tracking branch 'glitch-soc/main'	2022-05-10 10:17:24 +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	Merge branch 'main' of https://github.com/tootsuite/mastodon	2021-05-24 11:09:13 +02:00
routing	prototype for groups	2019-08-27 17:05:17 +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-03 10:16:49 +02:00
support	Spelling (#17705)	2022-03-06 22:51:40 +01:00
validators	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-01 16:52:27 +02:00
views	up from glitch	2022-03-29 10:14:34 +02: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