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	Add ability to filter audit log in admin UI (#13381)	2020-04-03 13:06:34 +02:00
settings	Set up /settings/keyword_mutes. #164.	2017-10-21 14:54:36 -05:00
accounts_helper_spec.rb	Split AccountsHelper from StatusesHelper (#12078)	2019-10-24 22:50:09 +02:00
application_helper_spec.rb	Spelling (#17705)	2022-03-06 22:51:40 +01:00
flashes_helper_spec.rb	Spec FlashesHelper (#3414)	2017-05-29 18:03:02 +02:00
home_helper_spec.rb	Fix locale related specs (#3707)	2017-06-12 10:58:03 +02:00
instance_helper_spec.rb	Do not default site_title with site_hostname in InstanceHelper (#6624)	2018-03-04 20:29:49 +01:00
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	Use URI.join even when S3 enabled (#4652)	2017-08-21 12:42:16 +02:00
statuses_helper_spec.rb	Change RTL detection to rely on unicode-bidi paragraph by paragraph (#14573)	2020-12-15 12:56:43 +01:00