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
..
assets	prototype for groups	2019-08-27 17:05:17 +02:00
chewy	Fix needlessly indexing unsearchable statuses into ElasticSearch (#12041)	2019-10-02 20:04:46 +02:00
controllers	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-02-12 10:03:28 +01:00
helpers	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-02-12 10:03:28 +01:00
javascript	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-02-12 10:03:28 +01:00
lib	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-02-12 10:03:28 +01:00
mailers	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-02-12 10:03:28 +01:00
models	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-02-12 10:03:28 +01:00
policies	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
presenters	Fix n+1 query for bookmarks on statuses (#12494)	2019-11-28 04:08:00 +01:00
serializers	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-02-12 10:03:28 +01:00
services	Fix invalid votes from the API being accepted (#12601)	2020-01-12 14:17:03 +01:00
validators	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-02-12 10:03:28 +01:00
views	Merge branch 'master' of https://github.com/tootsuite/mastodon	2020-02-12 10:03:28 +01:00
workers	Add publish/unpublish controls to announcements in admin UI (#12967)	2020-01-27 11:05:33 +01:00