Adds support for pleroma rights API #823
Conversation
Merge upstream changes
Conflicts: app/controllers/api/v1/mutes_controller.rb config/locales/simple_form.pl.yml
Merge upstream changes
Port ac092d0 to glitch-soc
Merge upstream changes
Inspired by f9b23a5
Port 460e380 to glitch-soc
Port f9b23a5 to glitch-soc
Port 2bbec9f to glitch-soc
Merge upstream changes
Port 9463bba to glitch-soc
Port 7901f9f to glitch-soc
Port e72db6d to glitch-soc
Port 61e6275 to glitch-soc
Port c9cbb8d to glitch-soc
Port 0893b16 to glitch-soc
Port 20bb90c to glitch-soc
Port 025fbb8 to glitch-soc
Merge upstream changes
Merge upstream changes
… account timelines Port dd00cd1 to glitch-soc
Port 3cecf3e to glitch-soc
Port c875f19 to glitch-soc
Merge upstream changes
…changing media Fixes mastodon#819
|
I don't have a problem with this change if it doesn't cause errors (either user- or developer-console-visible) in Mastodon instances. ( |
|
Well I’m not against this at all but this quite raises a question for me, as I could have upstreamed this one or probably others too. What should I/we upstream to glitch-soc, specially as for like more unstable/WIP modifications it might be better to be in pleroma’s repository so it’s more easily modifiable? My current answer to this one is:
And this shouldn’t break anything for glitch-soc (in fact most modifications I made other than branding/configuration shouldn’t break stuff). |
|
I only did that because you suggested merging it in the previous PR. |
|
This pull request has merge conflicts that must be resolved before it can be merged. |
Adapted from https://git.pleroma.social/pleroma/mastofe/commit/0c3fff7a9c7ae210c43232145648d5e45238bdc8
I'm not too sure about adding something exclusive to pleroma, but that might make their job downstream easier.