diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-14 22:11:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-14 22:11:56 +0100 |
| commit | c2fa0f7c40bcc4064e8baaa221665eadd391c001 (patch) | |
| tree | 74a5e58f2c724746d2e929b9df0e5682f17a2637 /app/models/account.rb | |
| parent | fa75324059c7a146354470691888dc0e1de0342f (diff) | |
| parent | 09ac5e7528ba3bfe90c20002f47c863d9afc6fcd (diff) | |
Merge pull request #960 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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 0bb20b2f2..6b539f004 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -108,6 +108,8 @@ class Account < ApplicationRecord :current_sign_in_ip, :current_sign_in_at, :confirmed?, + :approved?, + :pending?, :admin?, :moderator?, :staff?, |