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 09306d7c3c 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
..
accounts	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
admin	Add trending statuses (#17431)	3 years ago
announcements	Add announcements (#12662)	5 years ago
apps	Remove useless `respond_to` calls (#13208)	5 years ago
crypto	Optimize map { ... }.compact calls (#15513)	4 years ago
emails	Fix e-mail confirmations API not working correctly (#16348)	3 years ago
featured_tags	Changed tag most_used to recently_used (#14760)	4 years ago
instances	Add graphs and retention metrics to admin dashboard (#16829)	3 years ago
lists	Change REST API to return empty data for suspended accounts (#14765)	4 years ago
polls	Add more tests for ActivityPub controllers (#13585)	5 years ago
push	Add `policy` param to `POST /api/v1/push/subscriptions` (#16040)	4 years ago
statuses	Add edit history to web UI (#17390)	3 years ago
timelines	Fix “Show boosts/replies in public timelines” only affecting streaming	4 years ago
trends	Add trending statuses (#17431)	3 years ago
accounts_controller.rb	Change `follow` scope to be covered by `read` and `write` scopes in REST API (#17678)	3 years ago
announcements_controller.rb	Fix dismissing an announcement twice raising an obscure error (#13124)	5 years ago
apps_controller.rb	Add whitelist mode (#11291)	5 years ago
blocks_controller.rb	Change `follow` scope to be covered by `read` and `write` scopes in REST API (#17678)	3 years ago
bookmarks_controller.rb	Make Array-creation behavior of Paginable more predictable (#14687)	4 years ago
conversations_controller.rb	Make Array-creation behavior of Paginable more predictable (#14687)	4 years ago
custom_emojis_controller.rb	Remove useless `respond_to` calls (#13208)	5 years ago
directories_controller.rb	Add profile directory to web UI (#11688)	5 years ago
domain_blocks_controller.rb	Change `follow` scope to be covered by `read` and `write` scopes in REST API (#17678)	3 years ago
endorsements_controller.rb	Change REST API to return empty data for suspended accounts (#14765)	4 years ago
favourites_controller.rb	Make Array-creation behavior of Paginable more predictable (#14687)	4 years ago
featured_tags_controller.rb	Add featured tags API (#11778)	5 years ago
filters_controller.rb	Remove useless `respond_to` calls (#13208)	5 years ago
follow_requests_controller.rb	Fix duplicate notifications being possible after poll expiration (#17697)	3 years ago
instances_controller.rb	Remove useless `respond_to` calls (#13208)	5 years ago
lists_controller.rb	Add configuration option to filter replies in lists (#9205)	4 years ago
markers_controller.rb	Use Rails' index_by where it makes sense (#15542)	4 years ago
media_controller.rb	Allow editing media attachments for scheduled toots (#17690)	3 years ago
mutes_controller.rb	Change `follow` scope to be covered by `read` and `write` scopes in REST API (#17678)	3 years ago
notifications_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
polls_controller.rb	Add more tests for ActivityPub controllers (#13585)	5 years ago
preferences_controller.rb	Remove useless `respond_to` calls (#13208)	5 years ago
reports_controller.rb	Fix report category not being saved in REST API (#17682)	3 years ago
scheduled_statuses_controller.rb	Make Array-creation behavior of Paginable more predictable (#14687)	4 years ago
statuses_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
streaming_controller.rb	Remove useless `respond_to` calls (#13208)	5 years ago
suggestions_controller.rb	Change auto-following admin-selected accounts, show in recommendations (#16078)	4 years ago