mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-27 17:21:36 +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. |
||
|---|---|---|
| .. | ||
| activitypub | ||
| connection_pool | ||
| ostatus | ||
| settings | ||
| advanced_text_formatter_spec.rb | ||
| delivery_failure_tracker_spec.rb | ||
| emoji_formatter_spec.rb | ||
| entity_cache_spec.rb | ||
| extractor_spec.rb | ||
| fast_ip_map_spec.rb | ||
| feed_manager_spec.rb | ||
| hash_object_spec.rb | ||
| hashtag_normalizer_spec.rb | ||
| html_aware_formatter_spec.rb | ||
| link_details_extractor_spec.rb | ||
| permalink_redirector_spec.rb | ||
| plain_text_formatter_spec.rb | ||
| request_pool_spec.rb | ||
| request_spec.rb | ||
| sanitize_config_spec.rb | ||
| scope_transformer_spec.rb | ||
| status_filter_spec.rb | ||
| status_finder_spec.rb | ||
| status_reach_finder_spec.rb | ||
| suspicious_sign_in_detector_spec.rb | ||
| tag_manager_spec.rb | ||
| text_formatter_spec.rb | ||
| user_settings_decorator_spec.rb | ||
| webfinger_resource_spec.rb | ||