summaryrefslogtreecommitdiff
path: root/lib/api/events.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/api/events.rb')
-rw-r--r--lib/api/events.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/api/events.rb b/lib/api/events.rb
index b0713ff1d54..0787930f363 100644
--- a/lib/api/events.rb
+++ b/lib/api/events.rb
@@ -16,7 +16,7 @@ module API
end
def present_events(events)
- events = events.reorder(created_at: params[:sort])
+ events = events.preload(:author, :target, :noteable).reorder(created_at: params[:sort])
present paginate(events), with: Entities::Event
end
@@ -35,7 +35,7 @@ module API
get do
authenticate!
- events = EventsFinder.new(params.merge(source: current_user, current_user: current_user)).execute.preload(:author, :target)
+ events = EventsFinder.new(params.merge(source: current_user, current_user: current_user)).execute
present_events(events)
end
@@ -58,7 +58,7 @@ module API
user = find_user(params[:id])
not_found!('User') unless user
- events = EventsFinder.new(params.merge(source: user, current_user: current_user)).execute.preload(:author, :target)
+ events = EventsFinder.new(params.merge(source: user, current_user: current_user)).execute
present_events(events)
end
@@ -77,7 +77,7 @@ module API
use :sort_params
end
get ":id/events" do
- events = EventsFinder.new(params.merge(source: user_project, current_user: current_user)).execute.preload(:author, :target)
+ events = EventsFinder.new(params.merge(source: user_project, current_user: current_user)).execute
present_events(events)
end