Add domain block notes#11515
Merged
Gargron merged 9 commits intomastodon:masterfrom Aug 7, 2019
Merged
Conversation
ClearlyClaire
force-pushed
the
features/domain-notes
branch
from
dd84cb5 to
af096b7
Compare
ClearlyClaire
force-pushed
the
features/domain-notes
branch
3 times, most recently
from
5693430 to
ae9acae
Compare
ClearlyClaire
force-pushed
the
features/domain-notes
branch
from
ae9acae to
3fb9ef9
Compare
Member
|
Closed by accident? |
Contributor
Author
|
Yeah, I didn't even notice I closed it :| |
ClearlyClaire
force-pushed
the
features/domain-notes
branch
3 times, most recently
from
98af7b1 to
2fa4202
Compare
ClearlyClaire
force-pushed
the
features/domain-notes
branch
2 times, most recently
from
60ad62d to
e69a793
Compare
ClearlyClaire
force-pushed
the
features/domain-notes
branch
from
e69a793 to
7d7b037
Compare
Gargron
approved these changes
Aug 7, 2019
ghost
mentioned this pull request
hiyuki2578
pushed a commit
to ProjectMyosotis/mastodon
that referenced
this pull request
Oct 2, 2019
* Add database columns for adding notes to domain blocks/restrctions * Add admin UI to set private and public comments when blocking a domain * Add text for private and public comments on domain blocks * Show domain block comments in admin UI * Add comments to the domain block undo page * Make UnblockDomainService more robust regarding upgraded domain blocks * Allow editing domain blocks * Rename button from “undo domain block” to “view domain block” in account admin UI * Change test to unsilence silenced users from upgraded blocks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR adds a way to write comments regarding the reasons of instance blocks.
It also improves handling of upgrading an instance block, and allows editing (even downgrading) an instance block as long as it is triggered from the new “edit domain block” button.
It does not add anything to the admin API, as that API doesn't seem to cover domain blocks.
It does not actually add a way to display reasons publicly, as that would be dependent on #11298
Creating a new domain block
Displaying a domain block
Editing an existing domain block