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`.		2022-03-08 20:22:54 +01:00
..
admin
settings
accounts_helper_spec.rb
application_helper_spec.rb	Spelling (#17705)	2022-03-06 22:51:40 +01:00
flashes_helper_spec.rb
home_helper_spec.rb
instance_helper_spec.rb
jsonld_helper_spec.rb	Fix compacted JSON-LD possibly causing compatibility issues on forwarding (#17428)	2022-02-03 14:09:04 +01:00
languages_helper_spec.rb	Change languages to be listed under standard instead of native name in admin UI (#17485)	2022-02-09 04:15:38 +01:00
routing_helper_spec.rb
statuses_helper_spec.rb