mastodon/app
Thibaut Girka c56a504d11 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/serializers/rest/account_serializer.rb`:
  Upstream added code too close to glitch-soc-specific followers-hiding code.
  Ported upstream changes.
2020-01-27 15:46:50 +01:00
..
chewy Fix needlessly indexing unsearchable statuses into ElasticSearch (#12041) 2019-10-02 20:04:46 +02:00
controllers Merge branch 'master' into glitch-soc/merge-upstream 2020-01-27 15:46:50 +01:00
helpers Merge branch 'master' into glitch-soc/merge-upstream 2020-01-27 15:46:50 +01:00
javascript Merge branch 'master' into glitch-soc/merge-upstream 2020-01-27 15:46:50 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2020-01-27 15:46:50 +01:00
mailers Split AccountsHelper from StatusesHelper (#12078) 2019-10-24 22:50:09 +02:00
models Merge branch 'master' into glitch-soc/merge-upstream 2020-01-27 15:46:50 +01:00
policies Merge branch 'master' into glitch-soc/merge-upstream 2020-01-24 14:37:06 +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-01-27 15:46:50 +01:00
services Merge branch 'master' into glitch-soc/merge-upstream 2020-01-12 15:57:34 +01:00
validators Merge branch 'master' into glitch-soc/merge-upstream 2020-01-25 16:50:24 +01:00
views Merge branch 'master' into glitch-soc/merge-upstream 2020-01-27 15:46:50 +01:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2020-01-27 15:46:50 +01:00