mastodon-glitch/config
Thibaut Girka 45deca65b3 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/packs/public.js`:
  Conflict because part of that file has been split to
  `app/javascript/core/settings.js`. Ported those changes
  there.
2020-07-01 19:23:14 +02:00
..
environments Merge branch 'master' into glitch-soc/merge-upstream 2019-09-05 11:36:41 +02:00
initializers Merge branch 'master' into glitch-soc/merge-upstream 2020-07-01 19:23:14 +02:00
locales Change move handler to carry blocks over (#14144) 2020-07-01 13:51:15 +02:00
locales-glitch Add support for setting Content Warning for CW-less outgoing toots 2020-05-30 18:27:00 +02:00
webpack Merge branch 'master' into glitch-soc/merge-upstream 2020-06-09 10:39:20 +02:00
application.rb Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191) 2020-07-01 19:05:21 +02:00
boot.rb Fix bootsnap cache directory being declared relatively (#9511) 2018-12-13 05:19:52 +01:00
brakeman.ignore Add E2EE API (#13820) 2020-06-02 19:24:53 +02:00
database.yml config: add DB_SSLMODE for managed/remote PG (#10210) 2019-03-08 14:36:28 +01:00
deploy.rb Bump capistrano from 3.14.0 to 3.14.1 (#14037) 2020-06-17 06:31:30 +02:00
environment.rb
i18n-tasks.yml Merge branch 'master' into glitch-soc/merge-upstream 2020-07-01 19:23:14 +02:00
navigation.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-01-24 14:37:06 +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 'master' into glitch-soc/merge-upstream 2020-06-30 23:00:20 +02:00
secrets.yml
settings.yml Add support for setting Content Warning for CW-less outgoing toots 2020-05-30 18:27:00 +02:00
sidekiq.yml Change trending hashtags to not disappear instantly after midnight (#11712) 2019-09-02 18:11:13 +02:00
webpacker.yml Do not try to parse gif files as CSS or JS 2019-03-16 14:23:50 +01:00