mastodon/config
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
..
environments Merge branch 'main' into glitch-soc/merge-upstream 2022-04-25 17:09:32 +02:00
initializers Merge branch 'main' into glitch-soc/merge-upstream 2022-07-17 22:07:20 +02:00
locales Add support for editing labelling of one's own role (#18812) 2022-07-17 13:37:30 +02:00
locales-glitch Make “Flavour and skin” admin setting label translatable (#1791) 2022-05-31 16:52:52 +02:00
webpack Merge branch 'main' into glitch-soc/merge-upstream 2022-04-04 17:25:57 +02:00
application.rb Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
boot.rb Bump bootsnap from 1.6.0 to 1.8.1 (#16677) 2021-09-19 14:42:32 +09:00
brakeman.ignore Fix IDN domains not being rendered correctly in a few left-over places (#17848) 2022-03-22 10:07:11 +01:00
database.yml Format JSON and YAML using Prettier (#17823) 2022-03-21 04:46:11 +01:00
deploy.rb Bump capistrano from 3.16.0 to 3.17.0 (#17774) 2022-03-29 18:49:00 +09:00
environment.rb
i18n-tasks.yml Merge branch 'main' into glitch-soc/merge-upstream 2022-04-08 19:53:32 +02:00
navigation.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-07-05 09:33:44 +02:00
pghero.yml Fix PgHero Content-Security-Policy when CDN_HOST is used (#13595) 2020-05-04 13:52:41 +02:00
puma.rb Add PERSISTENT_TIMEOUT option (#11756) 2019-09-04 20:44:08 +02:00
roles.yml Add customizable user roles (#18641) 2022-07-05 02:41:40 +02:00
routes.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-07-17 22:07:20 +02:00
secrets.yml
settings.yml Merge branch 'main' into glitch-soc/merge-upstream 2022-04-08 19:53:32 +02:00
sidekiq.yml Change search indexing to use batches to minimize resource usage (#18451) 2022-05-18 23:29:14 +02:00
storage.yml Update Mastodon to Rails 6.1 (#15910) 2021-03-24 10:44:31 +01:00
webpacker.yml Do not try to parse gif files as CSS or JS 2019-03-16 14:23:50 +01:00