From: lain <lain@soykaf.club>
Date: Tue, 14 Apr 2020 16:31:30 +0000 (+0000)
Subject: Revert "Merge branch 'marker-update-fix' into 'develop'"
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=7c060432fcac294269742ac3f452beb3f9a2fdab;p=akkoma

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

This reverts merge request !2380
---

diff --git a/priv/repo/migrations/20200210050658_update_markers.exs b/priv/repo/migrations/20200210050658_update_markers.exs
index db7a355ec..b280e156c 100644
--- 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