Claire 01d6f7529f Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream added a link to the roadmap, but we have a completely different README. Kept ours. - `app/models/media_attachment.rb`: Upstream upped media attachment limits. Updated the default according to upstream's. - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream changed the migration compatibility level. Did so too. - `config/initializers/content_security_policy.rb`: Upstream refactored this file but we have a different version. Kept our version. - `app/controllers/settings/preferences_controller.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. The file does not directly references individual settings anymore. Applied upstream changes. - `app/lib/user_settings_decorator.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. The file got removed entirely. Removed it as well. - `app/models/user.rb`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. References to individual settings have been removed from the file. Removed them as well. - `app/views/settings/preferences/appearance/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `app/views/settings/preferences/notifications/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `app/views/settings/preferences/other/show.html.haml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. Applied upstream's changes and ported ours back. - `config/settings.yml`: Upstream completely refactored user settings storage, and glitch-soc has a different set of settings. In particular, upstream removed user-specific and unused settings. Did the same in glitch-soc. - `spec/controllers/application_controller_spec.rb`: Conflicts due to glitch-soc's theming system. Mostly kept our version, as upstream messed up the tests.		2023-03-31 21:30:27 +02:00
..
activitypub	Coverage improvement round-out following up previous work (#23987)	2023-03-10 13:33:30 +01:00
admin
api	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-31 21:30:27 +02:00
auth	Coverage improvement round-out following up previous work (#23987)	2023-03-10 13:33:30 +01:00
concerns
disputes
filters	Coverage improvement round-out following up previous work (#23987)	2023-03-10 13:33:30 +01:00
oauth
settings	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-31 21:30:27 +02:00
well_known
about_controller_spec.rb
accounts_controller_spec.rb
application_controller_spec.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-31 21:30:27 +02:00
authorize_interactions_controller_spec.rb
custom_css_controller_spec.rb	Coverage improvement round-out following up previous work (#23987)	2023-03-10 13:33:30 +01:00
emojis_controller_spec.rb
filters_controller_spec.rb	Coverage improvement round-out following up previous work (#23987)	2023-03-10 13:33:30 +01:00
follower_accounts_controller_spec.rb
following_accounts_controller_spec.rb
health_controller_spec.rb	Coverage improvement round-out following up previous work (#23987)	2023-03-10 13:33:30 +01:00
home_controller_spec.rb
instance_actors_controller_spec.rb
intents_controller_spec.rb
invites_controller_spec.rb
manifests_controller_spec.rb
media_controller_spec.rb
media_proxy_controller_spec.rb
privacy_controller_spec.rb	Coverage improvement round-out following up previous work (#23987)	2023-03-10 13:33:30 +01:00
relationships_controller_spec.rb
shares_controller_spec.rb
statuses_cleanup_controller_spec.rb
statuses_controller_spec.rb
tags_controller_spec.rb