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

Toggle sensitive from admin page #3261

Merged
merged 2 commits into from May 23, 2017
Merged

Toggle sensitive from admin page #3261

merged 2 commits into from May 23, 2017

Conversation

alpaca-tc
Copy link
Contributor

@alpaca-tc alpaca-tc commented May 23, 2017

Administrator can change sensitive column from admin page.
If sensitive status was reported, we can enable nsfw flag instead of deleting it.'

  • Added Admin::ReportedStatusesController#update to update sensitive column.
  • Added confirm option to link of trash to prevent wrong click.

screenshot:

1
2

@Gargron Gargron merged commit 7ee5fc5 into mastodon:master May 23, 2017
@alpaca-tc alpaca-tc deleted the nsfw_from_admin branch May 24, 2017 01:40
@ykzts ykzts mentioned this pull request Jun 8, 2017
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.

None yet

3 participants