sjw
/
pleroma
mirror of https://git.pleroma.social/sjw/pleroma.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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:
lain 2020-04-14 16:31:41 +00:00
parent bf3afbc1a1 7c060432fc
commit 3677a1e578
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
priv/repo/migrations/20200210050658_update_markers.exs
View File

@ -32,7 +32,7 @@ defmodule Pleroma.Repo.Migrations.UpdateMarkers 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