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

Update migrations and schema file

Browse Source 
It looks like they got out of sync when rebasing.
This commit is contained in:
Javi Martín
2019-06-07 17:29:05 +02:00
parent c93ec95917
commit 2a6c285257
7 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/legislation/people_proposal.rb
View File

@@ -21,7 +21,6 @@ class Legislation::PeopleProposal < ApplicationRecord
belongs_to :process, class_name: "Legislation::Process", foreign_key: "legislation_process_id"
belongs_to :author, -> { with_hidden }, class_name: "User", foreign_key: "author_id"
belongs_to :geozone
has_many :comments, as: :commentable
validates :title, presence: true

2
db/migrate/20190314150724_add_description_to_administrator.rb
View File

@@ -1,4 +1,4 @@
class AddDescriptionToAdministrator < ActiveRecord::Migration
class AddDescriptionToAdministrator < ActiveRecord::Migration[4.2]
def change
add_column :administrators, :description, :string
end

2
db/migrate/20190410132842_add_selected_to_proposal.rb
View File

@@ -1,4 +1,4 @@
class AddSelectedToProposal < ActiveRecord::Migration
class AddSelectedToProposal < ActiveRecord::Migration[4.2]
def change
add_column :proposals, :selected, :bool, default: false, index: true
end

2
db/migrate/20190423070619_add_people_proposals_phase_to_legislation_processes.rb
View File

@@ -1,4 +1,4 @@
class AddPeopleProposalsPhaseToLegislationProcesses < ActiveRecord::Migration
class AddPeopleProposalsPhaseToLegislationProcesses < ActiveRecord::Migration[4.2]
def change
add_column :legislation_processes, :people_proposals_phase_start_date, :date
add_column :legislation_processes, :people_proposals_phase_end_date, :date

2
db/migrate/20190423072214_create_legislation_people_proposals_table.rb
View File

@@ -1,4 +1,4 @@
class CreateLegislationPeopleProposalsTable < ActiveRecord::Migration
class CreateLegislationPeopleProposalsTable < ActiveRecord::Migration[4.2]
def change
create_table :legislation_people_proposals, force: :cascade do |t|
t.integer "legislation_process_id"

2
db/migrate/20190426072056_add_contact_fields_to_legislation_people_proposals.rb
View File

@@ -1,4 +1,4 @@
class AddContactFieldsToLegislationPeopleProposals < ActiveRecord::Migration
class AddContactFieldsToLegislationPeopleProposals < ActiveRecord::Migration[4.2]
def change
add_column :legislation_people_proposals, :email, :string
add_column :legislation_people_proposals, :phone, :string

5
db/schema.rb
View File

@@ -703,10 +703,7 @@ ActiveRecord::Schema.define(version: 20190429125842) do
t.string "instagram"
t.string "youtube"
t.string "website"
t.string "external_url"
t.integer "geozone_id"
t.index ["cached_votes_score"], name: "index_legislation_people_proposals_on_cached_votes_score", using: :btree
t.index ["geozone_id"], name: "index_legislation_people_proposals_on_geozone_id", using: :btree
end
create_table "legislation_process_translations", force: :cascade do |t|
@@ -1468,10 +1465,10 @@ ActiveRecord::Schema.define(version: 20190429125842) do
t.boolean "created_from_signature", default: false
t.integer "failed_email_digests_count", default: 0
t.text "former_users_data_log", default: ""
t.integer "balloted_heading_id"
t.boolean "public_interests", default: false
t.boolean "recommended_debates", default: true
t.boolean "recommended_proposals", default: true
t.integer "balloted_heading_id"
t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true, using: :btree
t.index ["email"], name: "index_users_on_email", unique: true, using: :btree
t.index ["geozone_id"], name: "index_users_on_geozone_id", using: :btree