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.

Claire 1fbd1fa5c4 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/settings/preferences_controller.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/lib/user_settings_decorator.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/models/status.rb`: Conflict because of slight change in how glitch-soc handles the scope to filter out local-only posts for anonymous viewers. Took upstream's changes and re-applied glitch-soc's change. - `app/models/user.rb`: Conflicts due to us having more user settings and upstream dropping `hide_network` (to replace it with an account attribute, properly migrated). Dropped `hide_network` like upstream. - `app/views/directories/index.html.haml`: Conflict because upstream redesigned that page while glitch-soc had a minor change to support hiding the number of followers. Ported glitch-soc's change on top of upstream's redesign. Additional changes: - `app/models/account_statuses_filter.rb`: See change to `app/models/status.rb`.		3 years ago
..
base_controller.rb	Add support for reversible suspensions through ActivityPub (#14989)	4 years ago
claims_controller.rb	Add E2EE API (#13820)	5 years ago
collections_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
followers_synchronizations_controller.rb	Fix followers synchronization mechanism not working when URI has empty path (#16744)	3 years ago
inboxes_controller.rb	Skip processing Update activities on unknown accounts (#15514)	4 years ago
outboxes_controller.rb	Fix performance of account timelines (#17709)	3 years ago
replies_controller.rb	Fix replies collection incorrectly looping (#17462)	3 years ago