fixes conflicts with polls

2017-01-29 00:44:56 +01:00
parent 6c34599e1e 8dc188e4cd
commit ea701e9963
10 changed files with 185 additions and 73 deletions
--- a/db/migrate/20170127173553_add_officer_assignment_to_votes.rb
+++ b/db/migrate/20170127173553_add_officer_assignment_to_votes.rb
@@ -0,0 +1,5 @@
+class AddOfficerAssignmentToVotes < ActiveRecord::Migration
+  def change
+    add_column :poll_voters, :officer_assignment_id, :integer, default: nil
+  end
+end