Merge branch 'require-signature' into 'develop'

[akkoma] / lib / pleroma / user_relationship.ex

diff --git a/lib/pleroma/user_relationship.ex b/lib/pleroma/user_relationship.ex
index 24c724549ed7bc41ff7f841f88297a5318a9d705..3149e10e9bfba36984481e2c2e8c0c599a3c1b39 100644 (file)
--- a/lib/pleroma/user_relationship.ex
+++ b/lib/pleroma/user_relationship.ex
@@ -58,7 +58,7 @@ defmodule Pleroma.UserRelationship do
       target_id: target.id
     })
     |> Repo.insert(
-      on_conflict: :replace_all_except_primary_key,
+      on_conflict: {:replace_all_except, [:id]},
       conflict_target: [:source_id, :relationship_type, :target_id]
     )
   end