diff options
| author | ThibG <thib@sitedethib.com> | 2021-01-18 14:37:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-18 14:37:57 +0100 |
| commit | 73d5b050196e9fdbe4c09f7d8650eed7562f2a08 (patch) | |
| tree | c8f898f74d17137205f5324f8189c71f36bf913b /app/controllers/api/v1 | |
| parent | a7a47834e50645746355e2b9a88244c1804c73cd (diff) | |
| parent | e202314a75d3277c26f151764ff183d61dd2f9d0 (diff) | |
Merge pull request #1484 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/api/v1')
| -rw-r--r-- | app/controllers/api/v1/markers_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/api/v1/markers_controller.rb b/app/controllers/api/v1/markers_controller.rb index 28c2ec791..867e6facf 100644 --- a/app/controllers/api/v1/markers_controller.rb +++ b/app/controllers/api/v1/markers_controller.rb @@ -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 |