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
..
_bio.html.haml	Refactor account and status formatting (#17877)	2022-03-28 01:17:17 +02:00
_header.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-08 16:17:19 +02:00
_moved.html.haml	Fix IDN domains not being rendered correctly in a few left-over places (#17848)	2022-03-22 10:07:11 +01:00
_og.html.haml
show.html.haml	Change how hashtags are normalized (#18795)	2022-07-13 15:03:28 +02:00
show.rss.ruby	Change how hashtags are normalized (#18795)	2022-07-13 15:03:28 +02:00