Thibaut Girka 249991c498 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile.lock - app/controllers/accounts_controller.rb - app/controllers/admin/dashboard_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/following_accounts_controller.rb - app/controllers/remote_follow_controller.rb - app/controllers/stream_entries_controller.rb - app/controllers/tags_controller.rb - app/javascript/packs/public.js - app/lib/sanitize_config.rb - app/models/account.rb - app/models/form/admin_settings.rb - app/models/media_attachment.rb - app/models/stream_entry.rb - app/models/user.rb - app/serializers/initial_state_serializer.rb - app/services/batched_remove_status_service.rb - app/services/post_status_service.rb - app/services/process_mentions_service.rb - app/services/reblog_service.rb - app/services/remove_status_service.rb - app/views/admin/settings/edit.html.haml - config/locales/simple_form.pl.yml - config/settings.yml - docker-compose.yml		2019-07-19 18:26:49 +02:00
..
accounts	Improve blocked view of profiles (#10491)	2019-04-07 04:59:13 +02:00
admin	Add moderation API (#9387)	2019-06-20 02:52:34 +02:00
apps
instances	Explicitly disable storage of REST API results (#10655)	2019-05-03 20:39:19 +02:00
lists
polls
push	Fix web push notifications for polls (#10864)	2019-05-28 00:26:08 +02:00
statuses	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-08 15:57:56 +02:00
timelines	Remove deprecated REST API GET /api/v1/timelines/direct (#11212)	2019-07-05 02:14:56 +02:00
accounts_controller.rb	Improve blocked view of profiles (#10491)	2019-04-07 04:59:13 +02:00
apps_controller.rb
blocks_controller.rb
bookmarks_controller.rb
conversations_controller.rb
custom_emojis_controller.rb	Add categories for custom emojis (#11196)	2019-06-28 15:54:10 +02:00
domain_blocks_controller.rb
endorsements_controller.rb
favourites_controller.rb
filters_controller.rb
follow_requests_controller.rb
instances_controller.rb	Explicitly disable storage of REST API results (#10655)	2019-05-03 20:39:19 +02:00
lists_controller.rb
media_controller.rb
mutes_controller.rb
notifications_controller.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-05-23 19:01:30 +02:00
polls_controller.rb	Fix poll API not requiring authentication on non-public polls (#10960)	2019-06-04 20:10:26 +02:00
preferences_controller.rb	Add a preferences API so apps can share basic behaviours (#10109)	2019-03-15 02:39:20 +01:00
reports_controller.rb
scheduled_statuses_controller.rb
search_controller.rb
statuses_controller.rb	Merge commit 'c07cca4727041ea5a5721acbc603d4bfb45a15a6' into glitch-soc/merge-upstream	2019-07-07 13:49:31 +02:00
streaming_controller.rb
suggestions_controller.rb