Thibaut Girka 83774367d2 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js` conflict because of the poll option limit being different than upstream's		2019-11-07 13:43:56 +01:00
..
controllers	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
fabricators	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
features
fixtures	Add noopener and/or noreferrer (#12202)	2019-10-24 22:44:42 +02:00
helpers	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-27 12:14:01 +01:00
lib	Merge branch 'master' into glitch-soc/merge-upstream	2019-11-06 14:38:28 +01:00
mailers	Add password challenge to 2FA settings, e-mail notifications (#11878)	2019-09-18 16:37:27 +02:00
models	Merge branch 'master' into glitch-soc/merge-upstream	2019-11-06 14:38:28 +01:00
policies
presenters
requests
routing
serializers/activitypub
services	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-27 12:14:01 +01:00
support
validators
views
workers	Fix various issues with account migration (#12301)	2019-11-07 09:05:07 +02:00
rails_helper.rb	Fix records not being indexed sometimes (#12024)	2019-10-01 01:19:11 +02:00
spec_helper.rb	Add ActivityPub actor representing the entire server (#11321)	2019-07-19 01:44:42 +02:00