consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix conflicts with fork

Browse Source
This commit is contained in:
rgarcia
2018-04-03 22:01:03 +02:00
parent 00c965b715
commit 8bb4dde6ac
1 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
db/schema.rb
View File

@@ -137,7 +137,6 @@ ActiveRecord::Schema.define(version: 20180320104823) do
t.string "feasibility", limit: 15, default: "undecided" t.string "feasibility", limit: 15, default: "undecided"
t.text "price_explanation" t.text "price_explanation"
t.text "unfeasibility_explanation" t.text "unfeasibility_explanation"
t.text "internal_comments"
t.boolean "valuation_finished", default: false t.boolean "valuation_finished", default: false
t.integer "valuator_assignments_count", default: 0 t.integer "valuator_assignments_count", default: 0
t.integer "price_first_year", limit: 8 t.integer "price_first_year", limit: 8
@@ -160,7 +159,6 @@ ActiveRecord::Schema.define(version: 20180320104823) do
t.datetime "unfeasible_email_sent_at" t.datetime "unfeasible_email_sent_at"
t.integer "ballot_lines_count", default: 0 t.integer "ballot_lines_count", default: 0
t.integer "previous_heading_id" t.integer "previous_heading_id"
t.integer "ballot_lines_count", default: 0
t.boolean "winner", default: false t.boolean "winner", default: false
t.boolean "incompatible", default: false t.boolean "incompatible", default: false
t.integer "community_id" t.integer "community_id"
@@ -189,16 +187,6 @@ ActiveRecord::Schema.define(version: 20180320104823) do
add_index "budget_phases", ["next_phase_id"], name: "index_budget_phases_on_next_phase_id", using: :btree add_index "budget_phases", ["next_phase_id"], name: "index_budget_phases_on_next_phase_id", using: :btree
add_index "budget_phases", ["starts_at"], name: "index_budget_phases_on_starts_at", using: :btree add_index "budget_phases", ["starts_at"], name: "index_budget_phases_on_starts_at", using: :btree
create_table "budget_polls", force: :cascade do |t|
t.string "name"
t.string "email"
t.string "preferred_subject"
t.boolean "collective"
t.boolean "public_worker"
t.boolean "proposal_author"
t.boolean "selected_proposal_author"
end
create_table "budget_reclassified_votes", force: :cascade do |t| create_table "budget_reclassified_votes", force: :cascade do |t|
t.integer "user_id" t.integer "user_id"
t.integer "investment_id" t.integer "investment_id"