Revert "Upstream 20240517"

2024-05-24 08:15:12 +09:00 · 2024-05-24 08:15:12 +09:00 · f6dec44e95
commit f6dec44e95
parent 9c006fd893
2347 changed files with 26470 additions and 87494 deletions
--- a/app/controllers/api/v1/markers_controller.rb
+++ b/app/controllers/api/v1/markers_controller.rb
@ -19,7 +19,7 @@ class Api::V1::MarkersController < Api::BaseController
      @markers = {}

      resource_params.each_pair do |timeline, timeline_params|
-        @markers[timeline] = current_user.markers.find_or_create_by(timeline: timeline)
+        @markers[timeline] = current_user.markers.find_or_initialize_by(timeline: timeline)
        @markers[timeline].update!(timeline_params)
      end
    end