Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Require explicit un-banning #264

Merged
merged 1 commit into from
Jan 15, 2016
Merged

Require explicit un-banning #264

merged 1 commit into from
Jan 15, 2016

Conversation

illicitonion
Copy link
Contributor

No description provided.

kegsay
kegsay reviewed Jan 15, 2016
View reviewed changes
api/client-server/banning.yaml
properties:
user_id:
type: string
description: The fully qualified user ID of the user being banned.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume you mean _un_banned.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

@kegsay
Copy link
Member

kegsay commented Jan 15, 2016

LGTM aside from confusion with transitions like:

  +------+----- BAZ
  |      |
FOO      |
         V
        BAR

which are hard to read. Would prefer:

  +------+ +--- BAZ
  |      | |
FOO      | |
         V V
         BAR

@kegsay
Copy link
Member

kegsay commented Jan 15, 2016

LGTM!

illicitonion added a commit that referenced this pull request Jan 15, 2016
@illicitonion
Merge pull request #264 from matrix-org/daniel/unban
9d1fc97 
Require explicit un-banning
@illicitonion illicitonion merged commit 9d1fc97 into master Jan 15, 2016
@illicitonion illicitonion mentioned this pull request Jan 15, 2016
Merged
@illicitonion illicitonion deleted the daniel/unban branch March 10, 2016 14:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@kegsay kegsay

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@illicitonion @kegsay