diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2019-04-09 16:06:30 +0200 |
|---|---|---|
| committer | Yamagishi Kazutoshi <ykzts@desire.sh> | 2019-04-09 23:06:30 +0900 |
| commit | 8b69a66380bbe32127e717ca2d79244392b7d2b6 (patch) | |
| tree | 3362aba467a4f40e108f38aa7bf4e76ba48df942 /app/controllers/admin | |
| parent | 0f3719f16fb5a2704416fa3afae00ba767ad2b2c (diff) | |
Add "why do you want to join" field to invite requests (#10524)
* Add "why do you want to join" field to invite requests Fix #10512 * Remove unused translations * Fix broken registrations when no invite request text is submitted
Diffstat (limited to 'app/controllers/admin')
| -rw-r--r-- | app/controllers/admin/pending_accounts_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/pending_accounts_controller.rb b/app/controllers/admin/pending_accounts_controller.rb index 2ea7785fc..249525504 100644 --- a/app/controllers/admin/pending_accounts_controller.rb +++ b/app/controllers/admin/pending_accounts_controller.rb @@ -30,7 +30,7 @@ module Admin private def set_accounts - @accounts = Account.joins(:user).merge(User.pending).page(params[:page]) + @accounts = Account.joins(:user).merge(User.pending).includes(user: :invite_request).page(params[:page]) end def form_account_batch_params |