From 7362439b50e7ac95945ad8453089091babc90f42 Mon Sep 17 00:00:00 2001 From: Manny Dinssa <44172848+Dinssa@users.noreply.github.com> Date: Tue, 13 Aug 2024 16:29:59 +0100 Subject: [PATCH] Restore merge_request in schema --- db/schema.rb | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/db/schema.rb b/db/schema.rb index 6e2e4daaf..5870b057d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -429,21 +429,19 @@ ActiveRecord::Schema[7.0].define(version: 2024_08_13_142947) do create_table "merge_requests", force: :cascade do |t| t.integer "requesting_organisation_id" + t.text "other_merging_organisations" t.datetime "created_at", null: false t.datetime "updated_at", null: false t.integer "status" t.integer "absorbing_organisation_id" - t.datetime "merge_date" - t.integer "requester_id" - t.string "helpdesk_ticket" - t.integer "total_users" - t.integer "total_schemes" - t.integer "total_lettings_logs" - t.integer "total_sales_logs" - t.integer "total_stock_owners" - t.integer "total_managing_agents" - t.boolean "signed_dsa", default: false - t.datetime "discarded_at" + t.boolean "new_absorbing_organisation" + t.boolean "telephone_number_correct" + t.string "new_telephone_number" + t.string "new_organisation_name" + t.string "new_organisation_address_line1" + t.string "new_organisation_address_line2" + t.string "new_organisation_postcode" + t.string "new_organisation_telephone_number" end create_table "notifications", force: :cascade do |t|