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
..
aliases
applications
deletes
exports
featured_tags	Change number_to_human calls to always use 3-digits precision (#16469)	2021-07-07 21:13:08 +02:00
flavours
imports
login_activities	Add full user agent in tooltips for login activities (#16428)	2021-06-23 16:42:23 +02:00
migration/redirects
migrations	Add (back) option to set redirect notice on account without moving followers (#11994)	2019-09-29 05:03:19 +02:00
preferences	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-08 20:22:54 +01:00
profiles	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-08 20:22:54 +01:00
shared
two_factor_authentication
two_factor_authentication_methods