Merge branch 'develop' into feature/hide-follows-remote

2019-07-31 14:12:29 +03:00 · 2019-07-31 14:12:29 +03:00 · c88a5d3251
commit c88a5d3251
parent 41e0304757 6657506185
43 changed files with 951 additions and 387 deletions
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@ -477,7 +477,7 @@ defmodule Pleroma.User do
  end

  def update_and_set_cache(changeset) do
-    with {:ok, user} <- Repo.update(changeset) do
+    with {:ok, user} <- Repo.update(changeset, stale_error_field: :id) do
      set_cache(user)
    else
      e -> e