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.

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

Add "invite request content" display in user account admin page #15265

Merged
merged 4 commits into from
Dec 15, 2020

Conversation

mashirozx
Copy link
Contributor

Fixed #14988

@mashirozx mashirozx force-pushed the pr-branch-display-invite-request branch from 0cb6021 to 21a18f0 Compare December 2, 2020 14:55
@ClearlyClaire
Copy link
Contributor

I'm a bit uneasy with keeping around information the user can't delete or change… that being said, it's currently being stored anyway, this PR only makes it so it gets displayed to the admin, so in this regard this PR is fine.

@mashirozx
Copy link
Contributor Author

mashirozx commented Dec 2, 2020

Yep, since normally admins won't check users' account detail pages frequently, a bit more information will never be too much for these who open these pages ʕ•ٹ•ʔ

@mashirozx mashirozx force-pushed the pr-branch-display-invite-request branch from 21a18f0 to f2fcc33 Compare December 3, 2020 16:43
@mashirozx
Copy link
Contributor Author

Moved to the bottom of page, just looks like moderation note.

d578d3df89406fe778825bd7be26d312.png

@mashirozx mashirozx changed the title Add feature of displaying invite_request_text in admin's user account page Add "invite request content" display in user account admin page Dec 3, 2020
config/locales/en.yml Outdated Show resolved Hide resolved
app/views/admin/accounts/show.html.haml Outdated Show resolved Hide resolved
app/views/admin/accounts/show.html.haml Outdated Show resolved Hide resolved
@mashirozx mashirozx force-pushed the pr-branch-display-invite-request branch from f2fcc33 to 9dd6a3c Compare December 15, 2020 02:37
@Gargron Gargron merged commit 75d2762 into mastodon:master Dec 15, 2020
ClearlyClaire added a commit to ClearlyClaire/mastodon that referenced this pull request Dec 18, 2020
Gargron pushed a commit that referenced this pull request Dec 18, 2020
For consistency with #15265

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
@mashirozx mashirozx deleted the pr-branch-display-invite-request branch May 17, 2021 03:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

keep user's registration request text in profile
3 participants