Fix conflics after rebase

2018-02-13 15:33:18 +01:00
parent 01f421717d
commit b8cc10d218
14 changed files with 176 additions and 17 deletions
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -163,6 +163,7 @@ ActiveRecord::Schema.define(version: 20180320104823) do
    t.boolean  "incompatible",                                default: false
    t.integer  "community_id"
    t.integer  "valuator_group_assignments_count",            default: 0
+    t.boolean  "visible_to_valuators",                  default: false
  end

  add_index "budget_investments", ["administrator_id"], name: "index_budget_investments_on_administrator_id", using: :btree