Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications

# Conflicts:
#	CHANGELOG.md

1 files changed, 15 insertions, 0 deletions

diff --git a/priv/repo/migrations/20200406105422_users_remove_source_data.exs b/priv/repo/migrations/20200406105422_users_remove_source_data.exs
new file mode 100644
index 000000000..9812d480f
--- /dev/null
+++ b/priv/repo/migrations/20200406105422_users_remove_source_data.exs
@@ -0,0 +1,15 @@
+defmodule Pleroma.Repo.Migrations.UsersRemoveSourceData do
+  use Ecto.Migration
+
+  def up do
+    alter table(:users) do
+      remove_if_exists(:source_data, :map)
+    end
+  end
+
+  def down do
+    alter table(:users) do
+      add_if_not_exists(:source_data, :map, default: %{})
+    end
+  end
+end