Merge branch 'revert-13a7105b' into 'develop'
Revert "Merge branch 'marker-update-fix' into 'develop'" See merge request pleroma/pleroma!2383
This commit is contained in:
commit
3677a1e578
1 changed files with 1 additions and 1 deletions
|
@ -32,7 +32,7 @@ defp update_markers do
|
||||||
end)
|
end)
|
||||||
|
|
||||||
Repo.insert_all("markers", markers_attrs,
|
Repo.insert_all("markers", markers_attrs,
|
||||||
on_conflict: {:replace, [:last_read_id]},
|
on_conflict: {:replace, [:last_read_id, :unread_count]},
|
||||||
conflict_target: [:user_id, :timeline]
|
conflict_target: [:user_id, :timeline]
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue