This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

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
..
activitypub	Merge branch 'master' into glitch-soc/merge-upstream	2019-12-07 12:28:59 +01:00
nodeinfo	Add `openRegistrations` attribute to nodeinfo endpoint (#12058)	2019-10-02 21:02:48 +02:00
rest	Merge branch 'master' into glitch-soc/merge-upstream	2020-03-08 19:38:53 +01:00
rss	Split AccountsHelper from StatusesHelper (#12078)	2019-10-24 22:50:09 +02:00
web	…
initial_state_serializer.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-27 12:14:01 +01:00
manifest_serializer.rb	…
oembed_serializer.rb	…
webfinger_serializer.rb	…