You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/lib
Claire e4f8679eae Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/models/form/admin_settings.rb`:
  New setting added upstream. Ported it.
- `app/views/statuses/_simple_status.html.haml`:
  Upstream removed RTL classes. Did the same.
- `config/settings.yml`:
  New setting added upstream. Ported it.
5 years ago
..
assets
chewy/strategy Fix records not being indexed sometimes (#12024) 6 years ago
devise Fix authentication before 2FA challenge (#11943) 6 years ago
generators
json_ld Fix preloaded JSON-LD context for identity not being used (#12138) 6 years ago
mastodon Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
paperclip Add stoplight for object storage failures, return HTTP 503 (#13043) 5 years ago
redis Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191) 5 years ago
tasks Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
templates
webpacker Add subresource integrity for JS and CSS assets (#15096) 5 years ago
cli.rb Deal with collation-related index corruption (#14860) 5 years ago