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
..
account_associations.rb
account_avatar.rb	Fix metadata scrubbing removing color profile from images (#20389)	2022-11-11 09:20:10 +01:00
account_counters.rb
account_finder_concern.rb	Fix situations in which instance actor can be set to a Mastodon-incompatible name (#22307)	2023-01-18 16:33:03 +01:00
account_header.rb	Fix metadata scrubbing removing color profile from images (#20389)	2022-11-11 09:20:10 +01:00
account_interactions.rb	Refactoring relations_map (#24195)	2023-03-21 10:32:58 +01:00
account_merging.rb	Autofix Rubocop Style/RedundantBegin (#23703)	2023-02-19 07:09:40 +09:00
attachmentable.rb	Change media upload limits and remove client-side resizing (#23726)	2023-03-25 10:00:03 +01:00
cacheable.rb
domain_materializable.rb	Fix unbounded recursion in account discovery (#22025)	2022-12-07 00:15:24 +01:00
domain_normalizable.rb	Fix error when invalid domain name is submitted (#19474)	2022-11-14 08:07:14 +01:00
expireable.rb	Run rubocop formatting except line length (#23632)	2023-02-18 06:56:20 +09:00
follow_limitable.rb
has_user_settings.rb	Change user settings to be stored in a more optimal way (#23630)	2023-03-30 14:44:00 +02:00
ldap_authenticable.rb
lockable.rb
omniauthable.rb	Fix external authentication not running onboarding code for new users (#23458)	2023-03-03 20:45:55 +01:00
paginable.rb	Autofix Rubocop Style/Lambda (#23696)	2023-02-18 12:39:00 +01:00
pam_authenticable.rb	Autofix Rubocop Style/RedundantBegin (#23703)	2023-02-19 07:09:40 +09:00
rate_limitable.rb
redisable.rb
relationship_cacheable.rb
remotable.rb	Autofix Rails/EagerEvaluationLogMessage (#23429)	2023-02-07 03:44:36 +01:00
status_snapshot_concern.rb
status_threading_concern.rb	Refactoring relations_map (#24195)	2023-03-21 10:32:58 +01:00