0
0
Fork 0

Merge branch 'master' into glitch-soc/merge-upstream

This commit is contained in:
Claire 2021-01-18 13:57:12 +01:00
commit e202314a75
18 changed files with 48 additions and 43 deletions

View file

@ -7,7 +7,7 @@ class Api::V1::MarkersController < Api::BaseController
before_action :require_user!
def index
@markers = current_user.markers.where(timeline: Array(params[:timeline])).each_with_object({}) { |marker, h| h[marker.timeline] = marker }
@markers = current_user.markers.where(timeline: Array(params[:timeline])).index_by(&:timeline)
render json: serialize_map(@markers)
end