diff options
| author | ThibG <thib@sitedethib.com> | 2019-06-25 22:43:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-25 22:43:33 +0200 |
| commit | ed10ae2693e83ac7fbac7273b2cf2ca424aca0c4 (patch) | |
| tree | a9bc878edcd521969d50fcc54fcc30f7b2ca54b5 /app/controllers/admin/accounts_controller.rb | |
| parent | 38d28824475056766c97385b66f4e04a5123e3a2 (diff) | |
| parent | 81bf43cfdd0d31ee4564a1399ce7fbe07eb04bb3 (diff) | |
Merge pull request #1138 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/admin/accounts_controller.rb')
| -rw-r--r-- | app/controllers/admin/accounts_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/admin/accounts_controller.rb b/app/controllers/admin/accounts_controller.rb index b0d45ce47..0c7760d77 100644 --- a/app/controllers/admin/accounts_controller.rb +++ b/app/controllers/admin/accounts_controller.rb @@ -127,6 +127,7 @@ module Admin :by_domain, :active, :pending, + :disabled, :silenced, :suspended, :username, |