Merge branch 'develop' into issue/1276-2

2020-05-06 05:55:39 +03:00 · 2020-05-06 05:55:39 +03:00 · fb38b7339c
commit fb38b7339c
parent fe7a0d660e 7612d9403d
40 changed files with 751 additions and 225 deletions
--- a/priv/repo/migrations/20200505072231_remove_magic_key_field.exs
+++ b/priv/repo/migrations/20200505072231_remove_magic_key_field.exs
@ -0,0 +1,9 @@
+defmodule Pleroma.Repo.Migrations.RemoveMagicKeyField do
+  use Ecto.Migration
+
+  def change do
+    alter table(:users) do
+      remove(:magic_key, :string)
+    end
+  end
+end