diff options
author | David Yip <yipdw@member.fsf.org> | 2017-10-16 15:46:12 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-16 15:46:12 -0500 |
commit | 7c44ad63550ccf3cb7532440f79196b20dc24c5d (patch) | |
tree | fb5d8ed08dc130607fd7fd31c67b7cad4ebfd8f5 /app/models/user.rb | |
parent | 6cd5b3bbe5a11fcf25bbefba2803f2ae840f39fc (diff) | |
parent | 37ff061d9bf0a91da6580960be01e3c6bc5e5c4c (diff) |
Merge pull request #181 from glitch-soc/upstream-merge-again
Merge upstream, pull in fixes for tootsuite/mastodon#{5409,5417}
Diffstat (limited to 'app/models/user.rb')
-rw-r--r-- | app/models/user.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 3bf069a31..325e27f44 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -102,6 +102,10 @@ class User < ApplicationRecord settings.auto_play_gif end + def setting_reduce_motion + settings.reduce_motion + end + def setting_system_font_ui settings.system_font_ui end |