diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-11-16 22:52:37 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-11-16 22:52:37 -0600 |
| commit | b28b405b9763a0bb3df653b51e6d084b42e9a54d (patch) | |
| tree | c69f1ccb99440fea8cc94014e77687238e205160 /app/models/account.rb | |
| parent | ee560abdbe7a2caf0f7ac6137faf248bbaff9a93 (diff) | |
| parent | dc6e031364d1f47a49ea47f20070a4e9986a4c68 (diff) | |
Merge remote-tracking branch 'origin/master' into gs-master
Diffstat (limited to 'app/models/account.rb')
| -rw-r--r-- | app/models/account.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index 863bfaa25..230a5d298 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -117,6 +117,8 @@ class Account < ApplicationRecord :current_sign_in_at, :confirmed?, :admin?, + :moderator?, + :staff?, :locale, to: :user, prefix: true, |