mastodon/lib
Thibaut Girka 7b435fd9bf Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/services/post_status_service.rb`:
  CW/sensitive logic fixed upstream, but different in glitch-soc.
  Ported the changes accordingly.
2020-03-27 21:54:44 +01:00
..
assets Add emoji autosuggest (#5053) 2017-09-23 14:47:32 +02:00
chewy/strategy Fix records not being indexed sometimes (#12024) 2019-10-01 01:19:11 +02:00
devise Fix authentication before 2FA challenge (#11943) 2019-09-24 04:35:36 +02:00
generators Add post-deployment migration system (#8182) 2018-08-13 18:17:20 +02:00
json_ld Fix preloaded JSON-LD context for identity not being used (#12138) 2019-10-10 06:48:53 +02:00
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2020-03-27 21:54:44 +01:00
paperclip Fix Paperclip using deprecated URI.escape function (#13320) 2020-03-26 15:09:16 +01:00
tasks Merge branch 'master' into glitch-soc/merge-upstream 2020-02-29 12:20:54 +01:00
templates Add post-deployment migration system (#8182) 2018-08-13 18:17:20 +02:00
cli.rb Close registration before self-destruct (#12877) 2020-01-21 18:56:18 +01:00