diff options
| author | Roman Chvanikov <chvanikoff@pm.me> | 2019-07-20 16:41:58 +0300 |
|---|---|---|
| committer | Roman Chvanikov <chvanikoff@pm.me> | 2019-07-20 16:41:58 +0300 |
| commit | 8292331b35f088a19a4d14eff69b74a6d1ed4746 (patch) | |
| tree | 3a4f85b315f299b59c36cbdb3f8830a4923c11da /lib/pleroma/user.ex | |
| parent | ae4fc58589ac48a0853719e6f83b2559b6de44fb (diff) | |
| parent | fe548f322e834c7c81678a460c54c71f1198021c (diff) | |
| download | pleroma-8292331b35f088a19a4d14eff69b74a6d1ed4746.tar.gz | |
Merge branch 'develop' into feature/digest-email
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 cf6aee547..c0e418e2f 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -1212,7 +1212,7 @@ defmodule Pleroma.User do data |> Map.put(:name, blank?(data[:name]) || data[:nickname]) |> remote_user_creation() - |> Repo.insert(on_conflict: :replace_all, conflict_target: :nickname) + |> Repo.insert(on_conflict: :replace_all_except_primary_key, conflict_target: :nickname) |> set_cache() end |