Merge remote-tracking branch 'tootsuite/master'

2017-11-19 01:30:29 -06:00
parent bcda3f85ce 08deec4c84
commit d083f7741a
38 changed files with 852 additions and 42 deletions
--- a/app/controllers/admin/settings_controller.rb
+++ b/app/controllers/admin/settings_controller.rb
@@ -13,6 +13,7 @@ module Admin
      closed_registrations_message
      open_deletion
      timeline_preview
+      show_staff_badge
      bootstrap_timeline_accounts
      thumbnail
    ).freeze
@@ -21,6 +22,7 @@ module Admin
      open_registrations
      open_deletion
      timeline_preview
+      show_staff_badge
    ).freeze

    UPLOAD_SETTINGS = %w(