Merge branch '2fa-improvements'

1 files changed, 0 insertions, 16 deletions

diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm
index d2929dcc0..620183078 100644
--- a/perllib/FixMyStreet/Cobrand/Default.pm
+++ b/perllib/FixMyStreet/Cobrand/Default.pm
@@ -748,12 +748,6 @@ sub available_permissions {
             contribute_as_body => _("Create reports/updates as the council"),
             default_to_body => _("Default to creating reports/updates as the council"),
             view_body_contribute_details => _("See user detail for reports created as the council"),
-
-            # NB this permission is special in that it can be assigned to users
-            # without their from_body being set. It's included here for
-            # reference, but left commented out because it's not assigned in the
-            # same way as other permissions.
-            # trusted => _("Trusted to make reports that don't need to be inspected"),
         },
         _("Users") => {
             user_edit => _("Edit users' details/search for their reports"),
@@ -1227,16 +1221,6 @@ sub category_extra_hidden {
     return 0;
 }
 
-=item reputation_increment_states/reputation_decrement_states
-
-Get a hashref of states that cause the reporting user's reputation to be
-incremented/decremented, if a report is changed to this state upon inspection.
-
-=cut
-
-sub reputation_increment_states { {} };
-sub reputation_decrement_states { {} };
-
 sub traffic_management_options {
     return [
         _("Yes"),