Baptiste Lemoine b872c1c7c0 Merge branch 'master' of https://github.com/tootsuite/mastodon ... Signed-off-by: Baptiste Lemoine <contact@cipherbliss.com> # Conflicts: # app/javascript/mastodon/components/status_action_bar.js # app/javascript/mastodon/features/status/components/action_bar.js		2020-02-12 10:03:28 +01:00
..
controllers	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-02-12 10:03:28 +01:00
fabricators	fix mess footer	2020-02-01 17:29:30 +01:00
features	Add feature test that tests behaviour of profile name and bio (#12658)	2020-01-03 02:44:06 +01:00
fixtures	Add noopener and/or noreferrer (#12202)	2019-10-24 22:44:42 +02:00
helpers	⚡ merge with gh master	2019-12-02 16:35:37 +01:00
lib	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-02-12 10:03: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' of https://github.com/tootsuite/mastodon	2020-02-12 10:03:28 +01:00
policies	Change admin UI for hashtags and add back whitelisted trends (#11490)	2019-08-05 19:54:29 +02:00
presenters	Admission-based registrations mode (#10250)	2019-03-14 05:28:30 +01:00
requests	⚡ merge with gh master	2019-12-02 16:35:37 +01: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	Fix media attachments without file being uploadable (#12562)	2020-01-23 21:40:03 +01:00
support	Fix base64-encoded file uploads not being possible (#12748)	2020-01-04 01:54:07 +01:00
validators	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-02-12 10:03:28 +01:00
views	prototype for groups	2019-08-27 17:05:17 +02:00
workers	Fix RefollowWorker not keeping show_reblogs setting (#12707)	2020-01-02 20:52:39 +01:00
rails_helper.rb	Fix records not being indexed sometimes (#12024)	2019-10-01 01:19:11 +02:00
spec_helper.rb	Move rspec examples to tmp dir (#12539)	2019-12-02 19:55:08 +01:00