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
..
credentials_controller_spec.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
follower_accounts_controller_spec.rb	Refactor and improve tests (#17386)	3 years ago
following_accounts_controller_spec.rb	Refactor and improve tests (#17386)	3 years ago
lists_controller_spec.rb	Refactor and improve tests (#17386)	3 years ago
notes_controller_spec.rb	Spelling (#17705)	3 years ago
pins_controller_spec.rb	Refactor and improve tests (#17386)	3 years ago
relationships_controller_spec.rb	Refactor and improve tests (#17386)	3 years ago
search_controller_spec.rb	Refactor and improve tests (#17386)	3 years ago
statuses_controller_spec.rb	Fix some flaky tests that randomly failed because of item ordering (#17509)	3 years ago