diff options
| author | lain <lain@soykaf.club> | 2020-01-28 17:06:36 +0100 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-01-28 17:06:36 +0100 |
| commit | d385789a450d455019c8aa6b6ee6abd28d5648e8 (patch) | |
| tree | d37b214ff074084c747cf7a7fa962cbf14e86f3c /lib/pleroma/user.ex | |
| parent | e3fae3380e2af0978436191127b148923f62ae53 (diff) | |
| parent | 271935953a384eb97606fb48d1b5c7befaf588e4 (diff) | |
| download | pleroma-d385789a450d455019c8aa6b6ee6abd28d5648e8.tar.gz | |
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag_feed
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 |