From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 15 Jul 2020 22:08:46 +0000 (-0500)
Subject: Squash User approval migrations
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=02cc42e72c5f7dde78c705c3cbc83d2c13fb7a71;p=akkoma

Squash User approval migrations
---

diff --git a/priv/repo/migrations/20200714043918_add_registration_reason_to_users.exs b/priv/repo/migrations/20200712234852_add_approval_fields_to_users.exs
similarity index 55%
rename from priv/repo/migrations/20200714043918_add_registration_reason_to_users.exs
rename to priv/repo/migrations/20200712234852_add_approval_fields_to_users.exs
index fa02fded4..559640f01 100644
--- a/priv/repo/migrations/20200714043918_add_registration_reason_to_users.exs
+++ b/priv/repo/migrations/20200712234852_add_approval_fields_to_users.exs
@@ -1,8 +1,9 @@
-defmodule Pleroma.Repo.Migrations.AddRegistrationReasonToUsers do
+defmodule Pleroma.Repo.Migrations.AddApprovalFieldsToUsers do
   use Ecto.Migration
 
   def change do
     alter table(:users) do
+      add(:approval_pending, :boolean)
       add(:registration_reason, :string)
     end
   end
diff --git a/priv/repo/migrations/20200712234852_add_approval_pending_to_users.exs b/priv/repo/migrations/20200712234852_add_approval_pending_to_users.exs
deleted file mode 100644
index f7eb8179b..000000000
--- a/priv/repo/migrations/20200712234852_add_approval_pending_to_users.exs
+++ /dev/null
@@ -1,9 +0,0 @@
-defmodule Pleroma.Repo.Migrations.AddApprovalPendingToUsers do
-  use Ecto.Migration
-
-  def change do
-    alter table(:users) do
-      add(:approval_pending, :boolean)
-    end
-  end
-end