mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-13 06:01:38 +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. |
||
---|---|---|
.. | ||
disputes | ||
reports | ||
trends | ||
users | ||
webhooks | ||
account_actions_controller.rb | ||
account_moderation_notes_controller.rb | ||
accounts_controller.rb | ||
action_logs_controller.rb | ||
announcements_controller.rb | ||
base_controller.rb | ||
change_emails_controller.rb | ||
confirmations_controller.rb | ||
custom_emojis_controller.rb | ||
dashboard_controller.rb | ||
domain_allows_controller.rb | ||
domain_blocks_controller.rb | ||
email_domain_blocks_controller.rb | ||
export_domain_allows_controller.rb | ||
export_domain_blocks_controller.rb | ||
follow_recommendations_controller.rb | ||
instances_controller.rb | ||
invites_controller.rb | ||
ip_blocks_controller.rb | ||
relationships_controller.rb | ||
relays_controller.rb | ||
report_notes_controller.rb | ||
reports_controller.rb | ||
resets_controller.rb | ||
roles_controller.rb | ||
rules_controller.rb | ||
settings_controller.rb | ||
site_uploads_controller.rb | ||
statuses_controller.rb | ||
tags_controller.rb | ||
warning_presets_controller.rb | ||
webhooks_controller.rb |