diff options
author | ThibG <thib@sitedethib.com> | 2018-08-26 13:23:52 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-26 13:23:52 +0200 |
commit | 2903f8f36b7c41b77de4ad6c8c5b0a6c0b2a7ace (patch) | |
tree | 4c8d12cc031476870a918bec3b3000f899101a32 /app/models/form/admin_settings.rb | |
parent | 0ddf439999b05b5dfd6d5a5257327fa7d3565e65 (diff) | |
parent | 246c313d457397f412f9fb5eed3ee02cf5d9a561 (diff) |
Merge pull request #671 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 | 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 010cf7fc3..9ea4ed322 100644 --- a/app/models/form/admin_settings.rb +++ b/app/models/form/admin_settings.rb @@ -30,6 +30,10 @@ class Form::AdminSettings :show_staff_badge=, :bootstrap_timeline_accounts, :bootstrap_timeline_accounts=, + :flavour, + :flavour=, + :skin, + :skin=, :min_invite_role, :min_invite_role=, :activity_api_enabled, @@ -40,6 +44,8 @@ class Form::AdminSettings :show_known_fediverse_at_about_page=, :preview_sensitive_media, :preview_sensitive_media=, + :custom_css, + :custom_css=, to: Setting ) end |