From: Ivan Tashkinov <ivant.business@gmail.com>
Date: Wed, 27 Mar 2019 12:41:40 +0000 (+0300)
Subject: Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=20e0f3660541f19cf878b789aa9f5b9d5ce8cddb;p=akkoma

Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
---

20e0f3660541f19cf878b789aa9f5b9d5ce8cddb
diff --cc lib/pleroma/user.ex
index 558216894,41289b4d0..1e44412d0
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@@ -51,11 -50,11 +51,12 @@@ defmodule Pleroma.User d
      field(:local, :boolean, default: true)
      field(:follower_address, :string)
      field(:search_rank, :float, virtual: true)
+     field(:search_type, :integer, virtual: true)
      field(:tags, {:array, :string}, default: [])
      field(:bookmarks, {:array, :string}, default: [])
-     field(:last_refreshed_at, :naive_datetime)
+     field(:last_refreshed_at, :naive_datetime_usec)
      has_many(:notifications, Notification)
 +    has_many(:registrations, Registration)
      embeds_one(:info, Pleroma.User.Info)
  
      timestamps()