mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-12-02 09:19:03 +01: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. |
||
|---|---|---|
| .. | ||
| account_moderation_note_policy.rb | ||
| account_policy.rb | ||
| account_warning_policy.rb | ||
| account_warning_preset_policy.rb | ||
| announcement_policy.rb | ||
| appeal_policy.rb | ||
| application_policy.rb | ||
| audit_log_policy.rb | ||
| backup_policy.rb | ||
| custom_emoji_policy.rb | ||
| dashboard_policy.rb | ||
| delivery_policy.rb | ||
| domain_allow_policy.rb | ||
| domain_block_policy.rb | ||
| email_domain_block_policy.rb | ||
| follow_recommendation_policy.rb | ||
| instance_policy.rb | ||
| invite_policy.rb | ||
| ip_block_policy.rb | ||
| poll_policy.rb | ||
| preview_card_policy.rb | ||
| preview_card_provider_policy.rb | ||
| relay_policy.rb | ||
| report_note_policy.rb | ||
| report_policy.rb | ||
| rule_policy.rb | ||
| settings_policy.rb | ||
| status_policy.rb | ||
| tag_policy.rb | ||
| user_policy.rb | ||
| user_role_policy.rb | ||
| webhook_policy.rb | ||