diff options
author | ThibG <thib@sitedethib.com> | 2019-08-07 20:04:22 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-07 20:04:22 +0200 |
commit | 86cfa2ea6cb94c9597b9fcda034c8b4d959c5e3e (patch) | |
tree | 2e1b3be0201e53c96f05993f1295b0e97bb14166 /app/models/form/admin_settings.rb | |
parent | 8400ddca7155005ab79485ed6054c04ea3ca5667 (diff) | |
parent | e8ad0a800616a1f95fd71ab8457869e716212ca0 (diff) |
Merge pull request #1193 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/form/admin_settings.rb')
-rw-r--r-- | app/models/form/admin_settings.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/form/admin_settings.rb b/app/models/form/admin_settings.rb index ecaed44f6..2c3a7f13b 100644 --- a/app/models/form/admin_settings.rb +++ b/app/models/form/admin_settings.rb @@ -35,6 +35,7 @@ class Form::AdminSettings show_reblogs_in_public_timelines show_replies_in_public_timelines spam_check_enabled + trends ).freeze BOOLEAN_KEYS = %i( @@ -51,6 +52,7 @@ class Form::AdminSettings show_reblogs_in_public_timelines show_replies_in_public_timelines spam_check_enabled + trends ).freeze UPLOAD_KEYS = %i( |