mastodon/config
Claire be493b6c0d Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/models/account.rb`:
  Not a real conflict, just upstream getting rid of unused constants too close
  to glitch-soc-specific contents.
  Removed unused constants like upstream did.
- `app/models/trends.rb`:
  Conflict because glitch-soc disabled email notifications for trending links.
  Upstream has refactored this quite a bit and added trending posts.
  Took upstream code, but disabling the extra trending stuff will come in
  another commit.
- `app/views/admin/trends/links/index.html.haml`:
  Conflict due to glitch-soc's theming system.
  Ported upstream changes accordingly.
2022-02-26 09:29:23 +01:00
..
environments Merge branch 'main' into glitch-soc/merge-upstream 2022-01-28 08:58:32 +01:00
initializers Merge branch 'main' into glitch-soc/merge-upstream 2022-02-23 18:13:12 +01:00
locales Add trending statuses (#17431) 2022-02-25 00:34:14 +01:00
locales-glitch Add link to /about/more to the CAPTCHA verification page 2022-01-26 14:09:11 +01:00
webpack Add support for multiple source files per pack 2022-02-12 00:10:28 +01:00
application.rb Add global locale param (#17464) 2022-02-08 02:34:56 +01:00
boot.rb Bump bootsnap from 1.6.0 to 1.8.1 (#16677) 2021-09-19 14:42:32 +09:00
brakeman.ignore Add trending statuses (#17431) 2022-02-25 00:34:14 +01:00
database.yml Escape database passwords in config/database.yml (#17627) 2022-02-25 01:16:52 +01:00
deploy.rb Change references to tootsuite/mastodon to mastodon/mastodon (#16491) 2021-07-13 15:46:20 +02:00
environment.rb
i18n-tasks.yml Merge branch 'main' into glitch-soc/merge-upstream 2022-02-23 18:13:12 +01:00
navigation.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-02-26 09:29:23 +01: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
routes.rb Merge branch 'main' into glitch-soc/merge-upstream 2022-02-26 09:29:23 +01:00
secrets.yml
settings.yml Merge branch 'main' into glitch-soc/merge-upstream 2022-02-17 10:58:44 +01:00
sidekiq.yml Change e-mail domain blocks to block IPs dynamically (#17635) 2022-02-24 17:28:23 +01: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