mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-24 22:26:54 +00:00
cd87d7dcef
- `.env.production.sample`: Our sample config file is very different from upstream since it is much more complete. Upstream added documentation for a few env variables. Copied the new variables/documentation from upstream. - `app/lib/feed_manager.rb`: Upstream added a timeline type (hashtags), while glitch-soc already had an extra one (direct messages). Not really a conflict but textually close changes. Ported upstream's changes. - `app/models/custom_emoji.rb`: Upstream upped the custom emoji size limit, while glitch-soc had configurable limits. Upped the default limits accordingly. - `streaming/index.js`: Upstream reworked how hastags were normalized. Minor conflict due to glitch-soc's handling of instance-local posts. Ported upstream's changes. |
||
---|---|---|
.. | ||
activitypub | ||
admin | ||
concerns | ||
import | ||
scheduler | ||
web | ||
webhooks | ||
account_deletion_worker.rb | ||
account_merging_worker.rb | ||
after_account_domain_block_worker.rb | ||
after_unallow_domain_worker.rb | ||
authorize_follow_worker.rb | ||
backup_worker.rb | ||
block_worker.rb | ||
bootstrap_timeline_worker.rb | ||
cache_buster_worker.rb | ||
delete_mute_worker.rb | ||
digest_mailer_worker.rb | ||
distribution_worker.rb | ||
domain_block_worker.rb | ||
domain_clear_media_worker.rb | ||
feed_insert_worker.rb | ||
fetch_reply_worker.rb | ||
import_worker.rb | ||
link_crawl_worker.rb | ||
local_notification_worker.rb | ||
merge_worker.rb | ||
move_worker.rb | ||
mute_worker.rb | ||
poll_expiration_notify_worker.rb | ||
post_process_media_worker.rb | ||
publish_announcement_reaction_worker.rb | ||
publish_scheduled_announcement_worker.rb | ||
publish_scheduled_status_worker.rb | ||
push_conversation_worker.rb | ||
push_encrypted_message_worker.rb | ||
push_update_worker.rb | ||
redownload_avatar_worker.rb | ||
redownload_header_worker.rb | ||
redownload_media_worker.rb | ||
refollow_worker.rb | ||
regeneration_worker.rb | ||
remote_account_refresh_worker.rb | ||
removal_worker.rb | ||
resolve_account_worker.rb | ||
thread_resolve_worker.rb | ||
trigger_webhook_worker.rb | ||
unfavourite_worker.rb | ||
unfollow_follow_worker.rb | ||
unmerge_worker.rb | ||
unpublish_announcement_worker.rb | ||
verify_account_links_worker.rb |