pleroma

commit: 3677a1e5785e8a753652debf37b2818e622f9ffd
parent: bf3afbc1a109e5965b335b21d4e7c522ad7a571c
Author: lain <lain@soykaf.club>
Date:   Tue, 14 Apr 2020 16:31:41 +0000

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

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

See merge request pleroma/pleroma!2383
Diffstat:
M
priv/repo/migrations/20200210050658_update_markers.exs
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git 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