Thibaut Girka a7aedebc31 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file. - `app/controllers/oauth/authorized_applications_controller.rb`: Upstream changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/base_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/controllers/settings/sessions_controller.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's theming system. Ported upstream changes. - `app/models/user.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc not preventing moved accounts from logging in. Ported upstream changes while keeping the ability for moved accounts to log in. - `app/policies/status_policy.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `app/serializers/rest/account_serializer.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's ability to hide followers count. Ported upstream changes. - `app/services/process_mentions_service.rb`: Upstream refactored and changed the logic surrounding suspended accounts. Minor conflict due to glitch-soc's local-only toots. Ported upstream changes. - `package.json`: Not a real conflict, upstream updated dependencies that were too close to glitch-soc-only ones in the file.		2020-09-28 14:13:30 +02:00
..
.gitkeep	Add post-deployment migration system (#8182)	2018-08-13 18:17:20 +02:00
20180813113448_copy_status_stats_cleanup.rb	Move status counters to separate table, count replies (#8104)	2018-08-14 19:19:32 +02:00
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	Revert "Remove conversation URI (#11423)" (#11424)	2019-07-28 17:47:37 +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
20190715031050_drop_subscriptions.rb	Remove WebSub subscriptions (#11303)	2019-07-21 04:08:00 +02:00
20190901040524_remove_score_from_tags.rb	Change trending hashtags to not disappear instantly after midnight (#11712)	2019-09-02 18:11:13 +02:00
20190927124642_remove_invalid_web_push_subscription.rb	Validate Web::PushSubscription (#11971)	2019-09-27 15:24:13 +02:00
20200917193528_migrate_notifications_type.rb	Add option to be notified when a followed user posts (#13546)	2020-09-18 17:26:45 +02:00
20200917222734_remove_index_notifications_on_account_activity.rb	Add option to be notified when a followed user posts (#13546)	2020-09-18 17:26:45 +02:00