mastodon/config
Thibaut Girka 9abb227250 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Our README.md files are completely different. Discarded upstream changes.
- `app/javascript/core/admin.js`:
  Updating rails-ujs, no real conflict, but a comment to close to changed
  code. Various glitch-soc-only files have been updated to match those changes,
  though.
- `package.json`:
  No real conflict, just an additional dependency in glitch-soc that was too
  close to something updated upstream. Took upstream's changes.
2020-03-22 16:10:44 +01: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-03-22 16:10:44 +01:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00
webpack Merge branch 'master' into glitch-soc/merge-upstream 2020-03-08 19:38:53 +01:00
application.rb Change local media attachments to perform heavy processing asynchronously (#13210) 2020-03-08 23:56:18 +01:00
boot.rb
brakeman.ignore
database.yml
deploy.rb Bump capistrano from 3.11.2 to 3.12.1 (#13264) 2020-03-18 21:48:03 +09:00
environment.rb
i18n-tasks.yml Merge branch 'master' into glitch-soc/merge-upstream 2019-11-20 15:36:09 +01:00
navigation.rb Merge branch 'master' into glitch-soc/merge-upstream 2020-01-24 14:37:06 +01:00
pghero.yml Use override_csp options on pghero (#12489) 2019-11-27 05:28:11 +01: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-03-22 16:10:44 +01:00
secrets.yml
settings.yml Merge branch 'master' into glitch-soc/master 2019-12-19 13:52:54 +01:00
sidekiq.yml Change trending hashtags to not disappear instantly after midnight (#11712) 2019-09-02 18:11:13 +02:00
webpacker.yml