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
..
trends	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
accounts_statuses_cleanup_scheduler.rb	Fix single Redis connection being used across all threads (#18135)	2022-04-28 17:47:34 +02:00
backup_cleanup_scheduler.rb
doorkeeper_cleanup_scheduler.rb
email_scheduler.rb
feed_cleanup_scheduler.rb
follow_recommendations_scheduler.rb	Add trending statuses (#17431)	2022-02-25 00:34:14 +01:00
indexing_scheduler.rb	Change search indexing to use batches to minimize resource usage (#18451)	2022-05-18 23:29:14 +02:00
instance_refresh_scheduler.rb
ip_cleanup_scheduler.rb	ip_cleanup_scheduler: Make IP and session retention configurable (#18757)	2022-07-07 03:14:28 +02:00
media_cleanup_scheduler.rb
pghero_scheduler.rb
scheduled_statuses_scheduler.rb
user_cleanup_scheduler.rb	Fix clean_discarded_statuses (#17822)	2022-03-19 09:24:08 +01:00