diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-08-12 15:31:20 +0200 |
---|---|---|
committer | ThibG <thib@sitedethib.com> | 2019-08-12 23:01:37 +0200 |
commit | 597ea5687a3601c6cc462831bf570bae05b08240 (patch) | |
tree | b95cc1a5d557e80b1f59c0aa72851fbc19649468 /app/models | |
parent | cf421bafdf644f8c8a44b4f06f82841cbd568cdf (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/models')
-rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 45a4b8989..341227d3e 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -108,7 +108,7 @@ class User < ApplicationRecord :reduce_motion, :system_font_ui, :noindex, :flavour, :skin, :display_media, :hide_network, :hide_followers_count, :expand_spoilers, :default_language, :aggregate_reblogs, :show_application, :advanced_layout, :use_blurhash, :use_pending_items, :trends, - :default_content_type, + :default_content_type, :system_emoji_font, to: :settings, prefix: :setting, allow_nil: false attr_reader :invite_code |