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-17 22:07:20 +02:00
nodeinfo	Add “services” and “metadata” to NodeInfo (#18563)	2022-06-01 16:24:07 +02:00
rest	Merge branch 'main' into glitch-soc/merge-upstream	2022-07-17 22:07:20 +02:00
web	Fix web push notifications containing HTML entities (#18071)	2022-04-23 21:47:43 +02:00
initial_state_serializer.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-07-05 09:33:44 +02:00
manifest_serializer.rb	Change brand color and logotypes (#18592)	2022-06-09 22:25:23 +02:00
oembed_serializer.rb
webfinger_serializer.rb