masto-fe/app
Thibaut Girka c790ecb14d Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
  Conflict due to upstream adding a new parameter (with_rate_limit),
  too close to glitch-soc's own additional parameter (content_type).
  Added upstream's parameter.
- `app/services/post_status_service.rb`:
  Conflict due to upstream adding a new parameter (rate_limit),
  too close to glitch-soc's own additional parameter (content_type).
  Added upstream's parameter.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict due to us not exposing theme settings here (as we have
  a different flavour/skin menu).
  Took upstream change, while still not exposing theme settings.
- `config/webpack/shared.js`:
  Coding style fixes for a part we have rewritten.
  Discarded upstream changes.
2020-03-08 19:38:53 +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-03-08 19:38:53 +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-08 19:38:53 +01:00
lib Merge branch 'master' into glitch-soc/merge-upstream 2020-03-08 19:38:53 +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-08 19:38:53 +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-08 19:38:53 +01:00
services Merge branch 'master' into glitch-soc/merge-upstream 2020-03-08 19:38:53 +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-08 19:38:53 +01:00
workers Merge branch 'master' into glitch-soc/merge-upstream 2020-01-27 15:46:50 +01:00