Thibaut Girka 9c3b9d5ab9 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Upstream deleted it, I decided to keep it. - `package.json`: Upstream updated a dependency textually too close to wavesurfer.js which has been deleted from upstream but is kept in glitch-soc for now.		2020-06-30 23:00:20 +02:00
..
accounts
admin
announcements
apps
crypto
featured_tags
instances
lists
polls
push
statuses
timelines
accounts_controller.rb	Add specific rate limits for posting and following (#13172)	2020-03-08 15:17:39 +01:00
announcements_controller.rb	Fix dismissing an announcement twice raising an obscure error (#13124)	2020-02-24 22:21:40 +01:00
apps_controller.rb	Add whitelist mode (#11291)	2019-07-30 11:10:46 +02:00
blocks_controller.rb	Remove useless respond_to calls (#13208)	2020-03-06 01:29:38 +01:00
bookmarks_controller.rb	Remove useless respond_to calls (#13208)	2020-03-06 01:29:38 +01:00
conversations_controller.rb
custom_emojis_controller.rb	Remove useless respond_to calls (#13208)	2020-03-06 01:29:38 +01:00
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	Add backend support to read and update list-specific show_replies settings	2018-11-28 14:46:07 +01:00
markers_controller.rb
media_controller.rb	Add customizable thumbnails for audio and video attachments (#14145)	2020-06-29 13:56:55 +02:00
mutes_controller.rb
notifications_controller.rb
polls_controller.rb	Add more tests for ActivityPub controllers (#13585)	2020-05-03 16:30:36 +02:00
preferences_controller.rb
reports_controller.rb
scheduled_statuses_controller.rb
statuses_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-03 21:23:49 +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	Remove useless respond_to calls (#13208)	2020-03-06 01:29:38 +01:00