logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 13a7105b21c1ea41e59b8d2ec36453bd08624867
parent: 5fc6ce30ac7c5e4d7e96bad22e6789cb2040fdbd
Author: lain <lain@soykaf.club>
Date:   Tue, 14 Apr 2020 13:17:44 +0000

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

Marker update migration: Don't try to update virtual field.

See merge request pleroma/pleroma!2380

Diffstat:

Mpriv/repo/migrations/20200210050658_update_markers.exs2+-
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, :unread_count]}, + on_conflict: {:replace, [:last_read_id]}, conflict_target: [:user_id, :timeline] ) end