Thibaut Girka 2a2af880b8 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	Add user notes on accounts (#14148)	2020-06-30 19:19:50 +02:00
admin
announcements
apps
crypto	Fix wrong route helper in encrypted messages controller (#13952)	2020-06-03 20:32:15 +02:00
featured_tags
instances
lists
polls	Add more tests for ActivityPub controllers (#13585)	2020-05-03 16:30:36 +02:00
push	Add more tests for ActivityPub controllers (#13585)	2020-05-03 16:30:36 +02:00
statuses	Add more tests for ActivityPub controllers (#13585)	2020-05-03 16:30:36 +02:00
timelines	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-10 16:19:56 +02:00
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
instances_controller.rb
lists_controller.rb
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	Add rate limit for reporting (#13390)	2020-04-05 14:40:08 +02:00
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
suggestions_controller.rb
trends_controller.rb