Merge remote-tracking branch 'origin/master' into gs-master

2017-11-16 22:52:37 -06:00
parent ee560abdbe dc6e031364
commit b28b405b97
29 changed files with 136 additions and 72 deletions
--- 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,