You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		4 years ago
..
.gitkeep	…
20180813113448_copy_status_stats_cleanup.rb	…
20180813160548_post_migrate_filters.rb	Split custom filter migration script using the post-deployment migration system	6 years ago
20181116184611_copy_account_stats_cleanup.rb	Extract counters from accounts table to account_stats table (#9295)	6 years ago
20190511152737_remove_suspended_silenced_account_fields.rb	Record account suspend/silence time and keep track of domain blocks (#10660)	6 years ago
20190519130537_remove_boosts_widening_audience.rb	Revert "Remove conversation URI (#11423)" (#11424)	5 years ago
20190706233204_drop_stream_entries.rb	Remove Atom feeds and old URLs in the form of `GET /:username/updates/:id` (#11247)	6 years ago
20190715031050_drop_subscriptions.rb	Remove WebSub subscriptions (#11303)	6 years ago
20190901040524_remove_score_from_tags.rb	Change trending hashtags to not disappear instantly after midnight (#11712)	5 years ago
20190927124642_remove_invalid_web_push_subscription.rb	Validate Web::PushSubscription (#11971)	5 years ago
20200917193528_migrate_notifications_type.rb	Add option to be notified when a followed user posts (#13546)	4 years ago
20200917222734_remove_index_notifications_on_account_activity.rb	Add option to be notified when a followed user posts (#13546)	4 years ago