IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "FEATURE: prevent accidental canceling when drafting penalties (#9105)" (#9122)

Browse Source 
This reverts commit 243284f998.

There are some issues in how the JS tests interact that I will need to figure out here before this can be merged.
This commit is contained in:
Jeff Wong
2020-03-05 15:29:51 -10:00
committed by GitHub
parent 243284f998
commit 6fe91bbbbb
6 changed files with 15 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/locales/client.en.yml
View File

@@ -4291,7 +4291,6 @@ en:
threshold_reached: "Received too many bounces from that email."
trust_level_change_failed: "There was a problem changing the user's trust level."
suspend_modal_title: "Suspend User"
confirm_cancel_penalty: "Are you sure you want to discard the penalty?"
trust_level_2_users: "Trust Level 2 Users"
trust_level_3_requirements: "Trust Level 3 Requirements"
trust_level_locked_tip: "trust level is locked, system will not promote or demote user"