diff options
| author | lain <lain@soykaf.club> | 2020-04-14 16:31:41 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-04-14 16:31:41 +0000 |
| commit | 3677a1e5785e8a753652debf37b2818e622f9ffd (patch) | |
| tree | e4c307c37a7a12052b6b34d4fce6b5f2833012f7 | |
| parent | bf3afbc1a109e5965b335b21d4e7c522ad7a571c (diff) | |
| parent | 7c060432fcac294269742ac3f452beb3f9a2fdab (diff) | |
| download | pleroma-3677a1e5785e8a753652debf37b2818e622f9ffd.tar.gz | |
Merge branch 'revert-13a7105b' into 'develop'
Revert "Merge branch 'marker-update-fix' into 'develop'"
See merge request pleroma/pleroma!2383
| -rw-r--r-- | priv/repo/migrations/20200210050658_update_markers.exs | 2 |
1 files changed, 1 insertions, 1 deletions
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 |