diff options
| author | ThibG <thib@sitedethib.com> | 2019-02-26 21:40:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-26 21:40:28 +0100 |
| commit | ff2270cd061b2dc3fc86a5b2bd77d0a3408b5716 (patch) | |
| tree | 75adb7dc4d3c37ecf87b43659538e20ec198d804 /app/models/user.rb | |
| parent | d82de360c13894746d3974d11c9505c8937ebdee (diff) | |
| parent | 1e06ca1c0af98cf61b1114b93249fb447e795edb (diff) | |
Merge pull request #930 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models/user.rb')
| -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 ce9ef2a13..f91ed7015 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -245,7 +245,7 @@ class User < ApplicationRecord end def shows_application? - @shows_application ||= settings.shows_application + @shows_application ||= settings.show_application end def token_for_app(a) |