Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations

6 files changed, 6 insertions, 6 deletions

diff --git a/priv/repo/migrations/20170426154155_create_websub_client_subscription.exs b/priv/repo/migrations/20170426154155_create_websub_client_subscription.exs
index f42782840..89d3af7ae 100644
--- a/priv/repo/migrations/20170426154155_create_websub_client_subscription.exs
+++ b/priv/repo/migrations/20170426154155_create_websub_client_subscription.exs
@@ -5,7 +5,7 @@ defmodule Pleroma.Repo.Migrations.CreateWebsubClientSubscription do
     create table(:websub_client_subscriptions) do
       add :topic, :string
       add :secret, :string
-      add :valid_until, :naive_datetime
+      add :valid_until, :naive_datetime_usec
       add :state, :string
       add :subscribers, :map
 
diff --git a/priv/repo/migrations/20170906143140_create_o_auth_authorizations.exs b/priv/repo/migrations/20170906143140_create_o_auth_authorizations.exs
index b4332870e..ead1d023e 100644
--- a/priv/repo/migrations/20170906143140_create_o_auth_authorizations.exs
+++ b/priv/repo/migrations/20170906143140_create_o_auth_authorizations.exs
@@ -6,7 +6,7 @@ defmodule Pleroma.Repo.Migrations.CreateOAuthAuthorizations do
       add :app_id, references(:apps)
       add :user_id, references(:users)
       add :token, :string
-      add :valid_until, :naive_datetime
+      add :valid_until, :naive_datetime_usec
       add :used, :boolean, default: false
 
       timestamps()
diff --git a/priv/repo/migrations/20170906152508_create_o_auth_token.exs b/priv/repo/migrations/20170906152508_create_o_auth_token.exs
index 7f8550f33..ed56bbf36 100644
--- a/priv/repo/migrations/20170906152508_create_o_auth_token.exs
+++ b/priv/repo/migrations/20170906152508_create_o_auth_token.exs
@@ -7,7 +7,7 @@ defmodule Pleroma.Repo.Migrations.CreateOAuthToken do
       add :user_id, references(:users)
       add :token, :string
       add :refresh_token, :string
-      add :valid_until, :naive_datetime
+      add :valid_until, :naive_datetime_usec
 
       timestamps()
     end
diff --git a/priv/repo/migrations/20180813003722_create_filters.exs b/priv/repo/migrations/20180813003722_create_filters.exs
index a273004ee..8e7129f34 100644
--- a/priv/repo/migrations/20180813003722_create_filters.exs
+++ b/priv/repo/migrations/20180813003722_create_filters.exs
@@ -8,7 +8,7 @@ defmodule Pleroma.Repo.Migrations.CreateFilters do
       add :hide, :boolean
       add :phrase, :string
       add :context, {:array, :string}
-      add :expires_at, :datetime
+      add :expires_at, :utc_datetime
       add :whole_word, :boolean
 
       timestamps()
diff --git a/priv/repo/migrations/20180919060348_users_add_last_refreshed_at.exs b/priv/repo/migrations/20180919060348_users_add_last_refreshed_at.exs
index 1942e4e9c..815177e05 100644
--- a/priv/repo/migrations/20180919060348_users_add_last_refreshed_at.exs
+++ b/priv/repo/migrations/20180919060348_users_add_last_refreshed_at.exs
@@ -3,7 +3,7 @@ defmodule Pleroma.Repo.Migrations.UsersAddLastRefreshedAt do
 
   def change do
     alter table(:users) do
-      add :last_refreshed_at, :naive_datetime
+      add :last_refreshed_at, :naive_datetime_usec
     end
   end
 end
diff --git a/priv/repo/migrations/20190123125546_create_instances.exs b/priv/repo/migrations/20190123125546_create_instances.exs
index b527ad7ec..3d23b343e 100644
--- a/priv/repo/migrations/20190123125546_create_instances.exs
+++ b/priv/repo/migrations/20190123125546_create_instances.exs
@@ -4,7 +4,7 @@ defmodule Pleroma.Repo.Migrations.CreateInstances do
   def change do
     create table(:instances) do
       add :host, :string
-      add :unreachable_since, :naive_datetime
+      add :unreachable_since, :naive_datetime_usec
 
       timestamps()
     end