diff options
| author | beatrix <beatrix.bitrot@gmail.com> | 2017-12-06 17:44:07 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-06 17:44:07 -0500 |
| commit | 81b01457598459c42a7b14d9aa14f91ba60dcae1 (patch) | |
| tree | 7d3e6dadb75f3be95e5a5ed8b7ecfe90e7711831 /app/controllers/settings/preferences_controller.rb | |
| parent | f1cbea77a4a52929244198dcbde26d63d837489a (diff) | |
| parent | 017fc81caf8f265e5c5543186877437485625795 (diff) | |
Merge pull request #229 from glitch-soc/glitch-theme
Advanced Next-Level Flavours And Skins For Mastodon™
Diffstat (limited to 'app/controllers/settings/preferences_controller.rb')
| -rw-r--r-- | app/controllers/settings/preferences_controller.rb | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb index 069026715..277f0f657 100644 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@ -1,10 +1,6 @@ # frozen_string_literal: true -class Settings::PreferencesController < ApplicationController - layout 'admin' - - before_action :authenticate_user! - +class Settings::PreferencesController < Settings::BaseController def show; end def update @@ -42,7 +38,8 @@ class Settings::PreferencesController < ApplicationController :setting_reduce_motion, :setting_system_font_ui, :setting_noindex, - :setting_theme, + :setting_flavour, + :setting_skin, notification_emails: %i(follow follow_request reblog favourite mention digest), interactions: %i(must_be_follower must_be_following) ) |