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 fa02fded4985e482f603a7d3214b88065ec767a9..559640f012500c4dfd3332e43a78379bb7fa6ab2 100644 (file)
--- 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 (file)
index f7eb817..0000000
--- 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