mastodon-glitch/config
Thibaut Girka f3eff922a3 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  Upstream bumped poll option character limit, but we already had
  a higher one, kept ours.
- `app/validators/poll_validator.rb`:
  Upstream bumped poll option character limit, but we already had
  a higher one, kept ours.
- `config/initializers/content_security_policy.rb`:
  Upstream added a rule, the way we compute ours is different, but
  that added rule has been ported.
- `package.json`:
  No real conflict, dependency update. Performed the same update.
- `yarn.lock`:
  No real conflict, dependency update. Performed the same update.
2020-04-02 20:32:00 +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-04-02 20:32:00 +02:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2020-04-02 20:32:00 +02:00
webpack Merge branch 'master' into glitch-soc/merge-upstream 2020-03-08 19:38:53 +01:00
application.rb Fix Paperclip using deprecated URI.escape function (#13320) 2020-03-26 15:09:16 +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-04-02 20:32:00 +02: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