catstodon/lib
Thibaut Girka 9c3b9d5ab9 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `.env.production.sample`:
  Upstream deleted it, I decided to keep it.
- `package.json`:
  Upstream updated a dependency textually too close to wavesurfer.js
  which has been deleted from upstream but is kept in glitch-soc for now.
2020-06-30 23:00:20 +02: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-06-30 23:00:20 +02:00
paperclip Add customizable thumbnails for audio and video attachments (#14145) 2020-06-29 13:56:55 +02:00
tasks Merge branch 'master' into glitch-soc/merge-upstream 2020-06-09 10:39:20 +02:00
templates Add post-deployment migration system (#8182) 2018-08-13 18:17:20 +02:00
cli.rb Fix help text around tootctl email_domain_blocks (#14147) 2020-06-26 21:28:40 +02:00