diff options
| author | ThibG <thib@sitedethib.com> | 2018-07-10 10:52:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-10 10:52:18 +0200 |
| commit | e6647ccf6d13030a91c7e635526e1e40a059ce31 (patch) | |
| tree | eda07c40c934ab9a55d7847afe4af3e54bce86b8 /app/models/form/admin_settings.rb | |
| parent | c699b2d141d7aa910bd81ae5fe881ecec7039395 (diff) | |
| parent | 402da8065c2b378cca6361f2c7252bd766f25dde (diff) | |
Merge pull request #557 from ThibG/glitch-soc/tentative-merge
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 32922e7f1..723480bdd 100644 --- a/app/models/form/admin_settings.rb +++ b/app/models/form/admin_settings.rb @@ -36,6 +36,8 @@ class Form::AdminSettings :peers_api_enabled=, :show_known_fediverse_at_about_page, :show_known_fediverse_at_about_page=, + :preview_sensitive_media, + :preview_sensitive_media=, to: Setting ) end |