diff options
| author | ThibG <thib@sitedethib.com> | 2018-12-16 15:26:50 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-16 15:26:50 +0100 |
| commit | 396c5dea87f259255f3676bb7b30f5cfdfec9d4e (patch) | |
| tree | 33c64f250983b0d8c07bad2a0ec970539e78b1d6 /app/controllers/admin/settings_controller.rb | |
| parent | f0505a5b2e727da73c8aa651b804508a8187a3c4 (diff) | |
| parent | 7238e4ea5f4f619396f73009032844d95bdf809c (diff) | |
Merge pull request #856 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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( |