Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation

2020-02-18 17:46:09 +03:00 · 2020-02-18 17:46:09 +03:00 · 61d9f43e46
commit 61d9f43e46
parent 269d592181 3fa2ac68df
162 changed files with 1389 additions and 719 deletions
--- a/test/support/helpers.ex
+++ b/test/support/helpers.ex
@ -54,6 +54,12 @@ defmodule Pleroma.Tests.Helpers do
          clear_config_all: 2
        ]

+      def to_datetime(naive_datetime) do
+        naive_datetime
+        |> DateTime.from_naive!("Etc/UTC")
+        |> DateTime.truncate(:second)
+      end
+
      def collect_ids(collection) do
        collection
        |> Enum.map(& &1.id)