Merge branch 'master' into master

2 files changed, 14 insertions, 8 deletions

diff --git a/db/migrate/20170403172249_add_action_taken_by_account_id_to_reports.rb b/db/migrate/20170403172249_add_action_taken_by_account_id_to_reports.rb
new file mode 100644
index 000000000..2d4e12198
--- /dev/null
+++ b/db/migrate/20170403172249_add_action_taken_by_account_id_to_reports.rb
@@ -0,0 +1,5 @@
+class AddActionTakenByAccountIdToReports < ActiveRecord::Migration[5.0]
+  def change
+    add_column :reports, :action_taken_by_account_id, :integer
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 5a9ca1426..3aaa3e3ad 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20170330164118) do
+ActiveRecord::Schema.define(version: 20170403172249) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -201,13 +201,14 @@ ActiveRecord::Schema.define(version: 20170330164118) do
   end
 
   create_table "reports", force: :cascade do |t|
-    t.integer  "account_id",                        null: false
-    t.integer  "target_account_id",                 null: false
-    t.bigint   "status_ids",        default: [],    null: false, array: true
-    t.text     "comment",           default: "",    null: false
-    t.boolean  "action_taken",      default: false, null: false
-    t.datetime "created_at",                        null: false
-    t.datetime "updated_at",                        null: false
+    t.integer  "account_id",                                 null: false
+    t.integer  "target_account_id",                          null: false
+    t.bigint   "status_ids",                 default: [],    null: false, array: true
+    t.text     "comment",                    default: "",    null: false
+    t.boolean  "action_taken",               default: false, null: false
+    t.datetime "created_at",                                 null: false
+    t.datetime "updated_at",                                 null: false
+    t.integer  "action_taken_by_account_id"
   end
 
   create_table "settings", force: :cascade do |t|