Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy

1 files changed, 15 insertions, 0 deletions

diff --git a/priv/repo/migrations/20200811125613_set_defaults_to_user_approval_pending.exs b/priv/repo/migrations/20200811125613_set_defaults_to_user_approval_pending.exs
new file mode 100644
index 000000000..eec7da03f
--- /dev/null
+++ b/priv/repo/migrations/20200811125613_set_defaults_to_user_approval_pending.exs
@@ -0,0 +1,15 @@
+defmodule Pleroma.Repo.Migrations.SetDefaultsToUserApprovalPending do
+  use Ecto.Migration
+
+  def up do
+    execute("UPDATE users SET approval_pending = false WHERE approval_pending IS NULL")
+
+    alter table(:users) do
+      modify(:approval_pending, :boolean, default: false, null: false)
+    end
+  end
+
+  def down do
+    :ok
+  end
+end