Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-14 00:08:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'a2f02a07758c32f0dcc6388b4f30ca5a84e762f3' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Claire
2024-01-15 20:27:41 +01:00
parent 8cad0a4d6b a2f02a0775
commit 2f521bc84a
275 changed files with 867 additions and 435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/v1/markers_controller.rb
View File

@@ -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_initialize_by(timeline: timeline)
@markers[timeline] = current_user.markers.find_or_create_by(timeline: timeline)
@markers[timeline].update!(timeline_params)
end
end