ff73d43b35
Conflicts: - `Gemfile.lock`: Not a real conflict, just an upstream dependency udpated textually too close to a glitch-soc-only dependency. Updated dependencies like upstream. - `app/controllers/settings/preferences_controller.rb`: Upstream added settings where we had extra glitch-soc-specific settings. Added upstream's new settings. - `app/models/user.rb`: Upstream added settings where we had extra glitch-soc-specific settings. Added upstream's new settings. - `config/i18n-tasks.yml`: Not a real conflict, just a new upstream line too textually close to a glitch-soc-only line. Ported upstream's change. |
||
---|---|---|
.. | ||
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 | ||
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_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_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 | ||
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 | ||
verify_link_service.rb | ||
vote_service.rb |