mastodon/app
Thibaut Girka 3788f37c30 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
..
chewy Fix bookmarks also searchable (#13293) 2020-03-22 02:40:03 +01:00
controllers Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2020-03-08 19:38:53 +01:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2020-03-27 21:54:44 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2020-03-27 21:54:44 +01:00
mailers Fix error when sending moderation notification (#13014) 2020-02-01 15:42:12 +01:00
models Merge branch 'master' into glitch-soc/merge-upstream 2020-03-27 21:54:44 +01:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2020-03-08 19:38:53 +01:00
presenters Merge branch 'master' into glitch-soc/merge-upstream 2019-11-30 17:29:44 +01:00
serializers Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00
services Merge branch 'master' into glitch-soc/merge-upstream 2020-03-27 21:54:44 +01:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2020-02-03 09:22:58 +01:00
views Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2020-03-22 16:10:44 +01:00