mastodon/app
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
..
chewy Change algorithm of tootctl search deploy to improve performance (#18463) 2022-05-22 22:16:43 +02:00
controllers Merge branch 'main' into glitch-soc/merge-upstream 2022-07-17 22:07:20 +02:00
helpers Merge branch 'main' into glitch-soc/merge-upstream 2022-07-05 09:33:44 +02:00
javascript Merge branch 'main' into glitch-soc/merge-upstream 2022-07-17 22:07:20 +02:00
lib Merge branch 'main' into glitch-soc/merge-upstream 2022-07-17 22:07:20 +02:00
mailers Prevent use locale with empty string (#18543) 2022-05-28 14:32:08 +02:00
models Merge branch 'main' into glitch-soc/merge-upstream 2022-07-17 22:07:20 +02:00
policies Merge branch 'main' into glitch-soc/merge-upstream 2022-07-17 22:07:20 +02:00
presenters Add ability to follow hashtags (#18809) 2022-07-17 13:49:29 +02:00
serializers Merge branch 'main' into glitch-soc/merge-upstream 2022-07-17 22:07:20 +02:00
services Merge branch 'main' into glitch-soc/merge-upstream 2022-07-17 22:07:20 +02:00
validators Merge branch 'main' into glitch-soc/merge-upstream 2022-06-10 11:51:43 +02:00
views Merge branch 'main' into glitch-soc/merge-upstream 2022-07-17 22:07:20 +02:00
workers Merge branch 'main' into glitch-soc/merge-upstream 2022-07-17 22:07:20 +02:00