Thibaut Girka 07eb31eeac Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/views/admin/settings/edit.html.haml:
  Conflict due to how the theming settings change.

2019-03-14 17:17:20 +01:00

..

assets

Add emoji autosuggest (#5053)

2017-09-23 14:47:32 +02:00

devise

Fix wrong string being used on login failure when using LDAP (#8534)

2018-09-01 03:35:37 +02:00

generators

Add post-deployment migration system (#8182)

2018-08-13 18:17:20 +02:00

json_ld

Preload common JSON-LD contexts (#9412)

2018-12-02 16:46:13 +01:00

mastodon

Merge branch 'master' into glitch-soc/merge-upstream

2019-03-14 17:17:20 +01:00

paperclip

Unconditionally re-encode locally-uploaded images to strip metadata

2018-09-17 21:09:59 +02:00

tasks

Merge branch 'master' into glitch-soc/merge-upstream

2019-01-20 16:49:23 +01:00

templates

Add post-deployment migration system (#8182)

2018-08-13 18:17:20 +02:00

cli.rb

Add tootctl statuses remove to sweep unreferenced statuses (#10063)

2019-03-11 13:45:17 +01:00