diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-28 21:11:13 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-01-28 21:11:13 +0300 |
| commit | ba5e8a644463a19b863e862def80adb6a5a1060b (patch) | |
| tree | b00fdfbfe13979454dcad185e8c0c7de237d8a0f /lib/pleroma/user.ex | |
| parent | e442ea5722404ca551135b6f4767c016952bbda3 (diff) | |
| parent | f1d5c0f07963c23d264311985c21837b9b03fd5a (diff) | |
| download | pleroma-ba5e8a644463a19b863e862def80adb6a5a1060b.tar.gz | |
Merge branch 'develop' into issue/1276
Diffstat (limited to 'lib/pleroma/user.ex')
| -rw-r--r-- | lib/pleroma/user.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 3899c34c2..3c86cdb38 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -1512,7 +1512,7 @@ defmodule Pleroma.User do data |> Map.put(:name, blank?(data[:name]) || data[:nickname]) |> remote_user_creation() - |> Repo.insert(on_conflict: :replace_all_except_primary_key, conflict_target: :nickname) + |> Repo.insert(on_conflict: {:replace_all_except, [:id]}, conflict_target: :nickname) |> set_cache() end |