Claire cd87d7dcef Merge branch 'main' into glitch-soc/merge-upstream ... - `.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.		2022-07-17 22:07:20 +02:00
..
activitypub	Merge branch 'main' into glitch-soc/merge-upstream	2022-07-05 08:49:22 +02:00
connection_pool
ostatus
settings
advanced_text_formatter_spec.rb	Add test	2022-05-24 10:26:04 +02:00
delivery_failure_tracker_spec.rb	Fix single Redis connection being used across all threads (#18135)	2022-04-28 17:47:34 +02:00
emoji_formatter_spec.rb	Change RSS feeds (#18356)	2022-05-09 07:43:08 +02:00
entity_cache_spec.rb
extractor_spec.rb
fast_ip_map_spec.rb
feed_manager_spec.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-28 11:11:18 +02:00
hash_object_spec.rb
hashtag_normalizer_spec.rb	Change how hashtags are normalized (#18795)	2022-07-13 15:03:28 +02:00
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