Thibaut Girka f3eff922a3 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: Upstream bumped poll option character limit, but we already had a higher one, kept ours. - `app/validators/poll_validator.rb`: Upstream bumped poll option character limit, but we already had a higher one, kept ours. - `config/initializers/content_security_policy.rb`: Upstream added a rule, the way we compute ours is different, but that added rule has been ported. - `package.json`: No real conflict, dependency update. Performed the same update. - `yarn.lock`: No real conflict, dependency update. Performed the same update.		2020-04-02 20:32:00 +02:00
..
accounts	Add federation support for the "hide network" preference (#11673)	2020-03-09 00:10:29 +01:00
admin
announcements
apps
featured_tags
instances
lists
polls
push
statuses
timelines
accounts_controller.rb
announcements_controller.rb
apps_controller.rb
blocks_controller.rb
bookmarks_controller.rb
conversations_controller.rb
custom_emojis_controller.rb
directories_controller.rb
domain_blocks_controller.rb
endorsements_controller.rb
favourites_controller.rb
featured_tags_controller.rb
filters_controller.rb
follow_requests_controller.rb	Add updated relationship to follow request API responses (#11800)	2019-09-10 20:56:42 +02:00
instances_controller.rb
lists_controller.rb
markers_controller.rb
media_controller.rb
mutes_controller.rb
notifications_controller.rb
polls_controller.rb
preferences_controller.rb
reports_controller.rb
scheduled_statuses_controller.rb
statuses_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-04-02 20:32:00 +02:00
streaming_controller.rb	Remove useless respond_to calls (#13208)	2020-03-06 01:29:38 +01:00
suggestions_controller.rb
trends_controller.rb