about summary refs log tree commit diff
path: root/app/controllers/settings/preferences_controller.rb
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2019-08-12 15:31:20 +0200
committerThibG <thib@sitedethib.com>2019-08-12 23:01:37 +0200
commit597ea5687a3601c6cc462831bf570bae05b08240 (patch)
treeb95cc1a5d557e80b1f59c0aa72851fbc19649468 /app/controllers/settings/preferences_controller.rb
parentcf421bafdf644f8c8a44b4f06f82841cbd568cdf (diff)
Add option to disable emoji replacements
Fixes #647

The option is found in `/settings` (because that was easier to write it this
way) but only affects the glitch-soc front-end.
Diffstat (limited to 'app/controllers/settings/preferences_controller.rb')
-rw-r--r--app/controllers/settings/preferences_controller.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb
index 418ea5d7a..f05dbe0ea 100644
--- a/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@@ -49,6 +49,7 @@ class Settings::PreferencesController < Settings::BaseController
       :setting_expand_spoilers,
       :setting_reduce_motion,
       :setting_system_font_ui,
+      :setting_system_emoji_font,
       :setting_noindex,
       :setting_hide_network,
       :setting_hide_followers_count,