diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-11-19 01:30:29 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-11-19 01:30:29 -0600 |
| commit | d083f7741a5996ee24bbdb7cd177e4db2ddfaead (patch) | |
| tree | 7c950b5ee0f16b59b7acae023eadd949325fc2d7 /app/controllers | |
| parent | bcda3f85ce1473e9285299979a471525b2cd7034 (diff) | |
| parent | 08deec4c84f00d241d60a6962806d5abe4638edd (diff) | |
Merge remote-tracking branch 'tootsuite/master'
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin/settings_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb index e81290228..d9199b3d5 100644 --- 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( |