tykayn d96d645e0f Merge branch 'master' of https://github.com/tootsuite/mastodon ... Signed-off-by: Baptiste Lemoine <contact@cipherbliss.com> # Conflicts: # yarn.lock		2021-01-13 14:45:58 +01:00
..
assets	prototype for groups	2019-08-27 17:05:17 +02:00
chewy	Change tootctl search deploy algorithm (#14300)	2020-07-14 18:10:35 +02:00
controllers	Merge branch 'master' of https://github.com/tootsuite/mastodon	2021-01-13 14:45:58 +01:00
helpers	Merge branch 'master' of https://github.com/tootsuite/mastodon 24 dec 2020	2020-12-24 16:38:36 +01:00
javascript	Merge branch 'master' of https://github.com/tootsuite/mastodon	2021-01-13 14:45:58 +01:00
lib	Use Rails' index_by where it makes sense (#15542)	2021-01-12 09:27:38 +01:00
mailers	Change account suspensions to be reversible by default (#14726)	2020-09-15 14:37:58 +02:00
models	Merge branch 'master' of https://github.com/tootsuite/mastodon	2021-01-13 14:45:58 +01:00
policies	Fix admins being able to suspend their instance actor (#14567)	2020-12-15 17:23:58 +01:00
presenters	Optimize map { ... }.compact calls (#15513)	2021-01-10 00:32:01 +01:00
serializers	Merge branch 'master' of https://github.com/tootsuite/mastodon 24 dec 2020	2020-12-24 16:38:36 +01:00
services	Optimize map { ... }.compact calls (#15513)	2021-01-10 00:32:01 +01:00
validators	Merge branch 'master' of https://github.com/tootsuite/mastodon	2021-01-13 14:45:58 +01:00
views	Merge branch 'master' of https://github.com/tootsuite/mastodon	2021-01-13 14:45:58 +01:00
workers	Fix being able to import more than allowed number of follows (#15384)	2020-12-26 23:52:46 +01:00