Thibaut Girka 1b0ff4cd69 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
- app/controllers/settings/notifications_controller.rb
- app/javascript/packs/public.js
- app/views/settings/preferences/show.html.haml
- app/views/stream_entries/_simple_status.html.haml
- config/locales/simple_form.en.yml
- config/locales/simple_form.pl.yml
- config/navigation.rb
- config/routes.rb

2019-06-10 18:59:53 +02: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-06-10 18:59:53 +02:00

paperclip

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

2019-05-04 16:37:26 +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

Record account suspend/silence time and keep track of domain blocks (#10660)

2019-05-14 19:05:02 +02:00