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
concerns
keys
account_search_service.rb
account_statuses_cleanup_service.rb
after_block_domain_from_account_service.rb
after_block_service.rb
after_unallow_domain_service.rb
app_sign_up_service.rb
appeal_service.rb
approve_appeal_service.rb
authorize_follow_service.rb
backup_service.rb
base_service.rb
batched_remove_status_service.rb
block_domain_service.rb
block_service.rb
bootstrap_timeline_service.rb
clear_domain_media_service.rb
create_featured_tag_service.rb
delete_account_service.rb
deliver_to_device_service.rb
fan_out_on_write_service.rb
favourite_service.rb
fetch_link_card_service.rb
fetch_oembed_service.rb
fetch_remote_status_service.rb
fetch_resource_service.rb
follow_migration_service.rb
follow_service.rb
import_service.rb
move_service.rb
mute_service.rb
notify_service.rb
post_status_service.rb
precompute_feed_service.rb
process_hashtags_service.rb
process_mentions_service.rb
purge_domain_service.rb
reblog_service.rb
reject_follow_service.rb
remove_domains_from_followers_service.rb
remove_featured_tag_service.rb
remove_from_followers_service.rb
remove_status_service.rb
report_service.rb
resolve_account_service.rb
resolve_url_service.rb
search_service.rb
suspend_account_service.rb
tag_search_service.rb
translate_status_service.rb
unallow_domain_service.rb
unblock_domain_service.rb
unblock_service.rb
unfavourite_service.rb
unfollow_service.rb
unmute_service.rb
unsuspend_account_service.rb
update_account_service.rb
update_status_service.rb	Merge branch 'main' into glitch-soc/merge-upstream	2023-03-31 21:30:27 +02:00
verify_link_service.rb
vote_service.rb
webhook_service.rb