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
..
.gitkeep
20180813113448_copy_status_stats_cleanup.rb
20180813160548_post_migrate_filters.rb	Split custom filter migration script using the post-deployment migration system	2018-08-16 20:30:09 +02:00
20181116184611_copy_account_stats_cleanup.rb	Extract counters from accounts table to account_stats table (#9295)	2018-11-19 00:43:52 +01:00
20190511152737_remove_suspended_silenced_account_fields.rb	Record account suspend/silence time and keep track of domain blocks (#10660)	2019-05-14 19:05:02 +02:00
20190519130537_remove_boosts_widening_audience.rb	Add post-deployment migration script to delete public-boosts-of-private-toots (#10783)	2019-05-19 13:49:31 +02:00
20190706233204_drop_stream_entries.rb	Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)	2019-07-07 16:16:51 +02:00