diff options
| author | Reverite <github@reverite.sh> | 2019-05-06 18:17:05 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-05-06 18:17:05 -0700 |
| commit | 5b85256b334b13fad26a2bc073a874750a3cdc2e (patch) | |
| tree | 2d523aa8266e42ae31ab82c7fc2533cf4a90ff0d /app/models/form/admin_settings.rb | |
| parent | e10a9794f4ed7c90e3190f285359f55dd00da435 (diff) | |
| parent | 89d2859296bc5a57a8db07be86239cc938a3f691 (diff) | |
Merge remote-tracking branch 'glitch/master' into production
Diffstat (limited to 'app/models/form/admin_settings.rb')
| -rw-r--r-- | app/models/form/admin_settings.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb index 83d303c33..0e9bfb265 100644 --- a/app/models/form/admin_settings.rb +++ b/app/models/form/admin_settings.rb @@ -27,10 +27,13 @@ class Form::AdminSettings custom_css profile_directory hide_followers_count + enable_keybase flavour_and_skin thumbnail hero mascot + show_reblogs_in_public_timelines + show_replies_in_public_timelines ).freeze BOOLEAN_KEYS = %i( @@ -43,6 +46,9 @@ class Form::AdminSettings preview_sensitive_media profile_directory hide_followers_count + enable_keybase + show_reblogs_in_public_timelines + show_replies_in_public_timelines ).freeze UPLOAD_KEYS = %i( |