chuckya/app/javascript/mastodon/features/compose
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
..
components Merge branch 'master' into glitch-soc/merge-upstream 2020-03-08 19:38:53 +01:00
containers Fix WebUI allowing to upload more items than the limit (#12300) 2019-11-07 09:07:03 +02:00
util Misc. typos (#8694) 2018-09-14 00:53:09 +02:00
index.js Add confirmation modal when logging out from the web app (#11671) 2019-08-26 18:24:10 +02:00