Merge branch 'master' into legislation-module-stable

This commit is contained in:
Amaia Castro
2017-01-17 10:46:33 +01:00
40 changed files with 687 additions and 127 deletions

View File

@@ -55,6 +55,7 @@ end
admin = create_user('admin@consul.dev', 'admin')
admin.create_administrator
admin.update(residence_verified_at: Time.current, confirmed_phone: Faker::PhoneNumber.phone_number, document_type: "1", verified_at: Time.current, document_number: "1111111111")
moderator = create_user('mod@consul.dev', 'mod')
moderator.create_moderator

View File

@@ -0,0 +1,5 @@
class AddUnfeasibleEmailSentAtToBudgetInvestments < ActiveRecord::Migration
def change
add_column :budget_investments, :unfeasible_email_sent_at, :datetime
end
end

View File

@@ -11,7 +11,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema.define(version: 20170106130838) do
ActiveRecord::Schema.define(version: 20170114154421) do
# These are extensions that must be enabled in order to support this database
enable_extension "plpgsql"
@@ -143,6 +143,7 @@ ActiveRecord::Schema.define(version: 20170106130838) do
t.boolean "selected", default: false
t.string "location"
t.string "organization_name"
t.datetime "unfeasible_email_sent_at"
end
add_index "budget_investments", ["administrator_id"], name: "index_budget_investments_on_administrator_id", using: :btree