Merge branch 'master' into feature/add_population_to_budget_heading

db/migrate/20170620132731_create_budget_investment_milestones.rb

@@ -0,0 +1,11 @@
+class CreateBudgetInvestmentMilestones < ActiveRecord::Migration
+  def change
+    create_table :budget_investment_milestones do |t|
+      t.integer :investment_id
+      t.string   "title", limit: 80
+      t.text     "description"
+
+      t.timestamps null: false
+    end
+  end
+end

db/schema.rb

@@ -115,6 +115,14 @@ ActiveRecord::Schema.define(version: 20170621180611) do
 
   add_index "budget_headings", ["group_id"], name: "index_budget_headings_on_group_id", using: :btree
 
+  create_table "budget_investment_milestones", force: :cascade do |t|
+    t.integer  "investment_id"
+    t.string   "title",         limit: 80
+    t.text     "description"
+    t.datetime "created_at",               null: false
+    t.datetime "updated_at",               null: false
+  end
+
   create_table "budget_investments", force: :cascade do |t|
     t.integer  "author_id"
     t.integer  "administrator_id"
@@ -414,8 +422,8 @@ ActiveRecord::Schema.define(version: 20170621180611) do
     t.date     "allegations_end_date"
     t.date     "result_publication_date"
     t.datetime "hidden_at"
-    t.datetime "created_at",             null: false
-    t.datetime "updated_at",             null: false
+    t.datetime "created_at",                                 null: false
+    t.datetime "updated_at",                                 null: false
     t.text     "summary"
     t.boolean  "debate_phase_enabled",       default: false
     t.boolean  "allegations_phase_enabled",  default: false
@@ -925,7 +933,7 @@ ActiveRecord::Schema.define(version: 20170621180611) do
     t.boolean  "email_digest",                              default: true
     t.boolean  "email_on_direct_message",                   default: true
     t.boolean  "official_position_badge",                   default: false
-    t.datetime "password_changed_at",                       default: '2016-12-21 17:55:08', null: false
+    t.datetime "password_changed_at",                       default: '2017-06-22 11:21:30', null: false
     t.boolean  "created_from_signature",                    default: false
     t.integer  "failed_email_digests_count",                default: 0
     t.text     "former_users_data_log",                     default: ""