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
..
direct_controller.rb	Use a redis-cached feed for the DM timeline	2019-06-27 16:44:12 +02:00
home_controller.rb	Remove useless respond_to calls (#13208)	2020-03-06 01:29:38 +01:00
list_controller.rb	Support min_id-based pagination in REST API (#8736)	2018-09-28 02:23:45 +02:00
public_controller.rb	Remove useless respond_to calls (#13208)	2020-03-06 01:29:38 +01:00
tag_controller.rb	Remove useless respond_to calls (#13208)	2020-03-06 01:29:38 +01:00