diff options
| author | pluralcafe-docker <git@plural.cafe> | 2018-12-17 01:28:17 +0000 |
|---|---|---|
| committer | pluralcafe-docker <git@plural.cafe> | 2018-12-17 01:28:17 +0000 |
| commit | f290c5e2c337bb0aab82cb23653d4ff084ba8bbe (patch) | |
| tree | 65712093ee4852a04fab5160cea341cb80f91747 /app/controllers/admin/settings_controller.rb | |
| parent | 87f09d3bebd2d890ecad19d360fc687f1a57f3b0 (diff) | |
| parent | 396c5dea87f259255f3676bb7b30f5cfdfec9d4e (diff) | |
Merge branch 'glitch'
Diffstat (limited to 'app/controllers/admin/settings_controller.rb')
| -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 fe2720c48..76b3c3a2b 100644 --- a/app/controllers/admin/settings_controller.rb +++ b/app/controllers/admin/settings_controller.rb @@ -28,6 +28,7 @@ module Admin show_known_fediverse_at_about_page preview_sensitive_media custom_css + profile_directory ).freeze BOOLEAN_SETTINGS = %w( @@ -39,6 +40,7 @@ module Admin peers_api_enabled show_known_fediverse_at_about_page preview_sensitive_media + profile_directory ).freeze UPLOAD_SETTINGS = %w( |