diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-12-16 11:50:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-16 11:50:35 +0100 |
| commit | 7ca0a71601f92064db64862c8cab46a77d9c3d3d (patch) | |
| tree | 342c9a8972757d3706903a40e27a6f8e5a43533e /app/controllers/api/v1/notifications_controller.rb | |
| parent | 3868ba683d56dbbeecc839fdeaeb7b3d0b18bb9a (diff) | |
| parent | 0912fb736d435b132779828376cd10cf7ad8e56e (diff) | |
Merge pull request #2014 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api/v1/notifications_controller.rb')
| -rw-r--r-- | app/controllers/api/v1/notifications_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/api/v1/notifications_controller.rb b/app/controllers/api/v1/notifications_controller.rb index ac49167cb..a6ed359c9 100644 --- a/app/controllers/api/v1/notifications_controller.rb +++ b/app/controllers/api/v1/notifications_controller.rb @@ -40,7 +40,7 @@ class Api::V1::NotificationsController < Api::BaseController private def load_notifications - notifications = browserable_account_notifications.includes(from_account: :account_stat).to_a_paginated_by_id( + notifications = browserable_account_notifications.includes(from_account: [:account_stat, :user]).to_a_paginated_by_id( limit_param(DEFAULT_NOTIFICATIONS_LIMIT), params_slice(:max_id, :since_id, :min_id) ) |