Merge branch 'revert-13a7105b' into 'develop'

Revert "Merge branch 'marker-update-fix' into 'develop'"

See merge request pleroma/pleroma!2383

diff --git a/priv/repo/migrations/20200210050658_update_markers.exs b/priv/repo/migrations/20200210050658_update_markers.exs
index db7a355ec1b918c38ee876c70f226c3b91ce1262..b280e156c7fc8bb43ed44a1d550c2c3e5fee180f 100644 (file)
--- a/priv/repo/migrations/20200210050658_update_markers.exs
+++ b/priv/repo/migrations/20200210050658_update_markers.exs
@@ -32,7 +32,7 @@ defmodule Pleroma.Repo.Migrations.UpdateMarkers do
       end)
 
     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]
     )
   end