Merge branch 'master' into polls_minor_changes

db/migrate/20171002103314_add_poll_shift_task_index.rb

@@ -0,0 +1,7 @@
+class AddPollShiftTaskIndex < ActiveRecord::Migration
+  def change
+    remove_index "poll_shifts", name: "index_poll_shifts_on_booth_id_and_officer_id"
+    add_index :poll_shifts, :task
+    add_index :poll_shifts, [:booth_id, :officer_id, :task], unique: true
+  end
+end

db/migrate/20171002121658_add_origin_to_poll_voters.rb

@@ -0,0 +1,5 @@
+class AddOriginToPollVoters < ActiveRecord::Migration
+  def change
+    add_column :poll_voters, :origin, :string
+  end
+end

db/migrate/20171002191347_add_default_to_recount_amounts.rb

@@ -0,0 +1,7 @@
+class AddDefaultToRecountAmounts < ActiveRecord::Migration
+  def change
+    change_column_default :poll_recounts, :white_amount, 0
+    change_column_default :poll_recounts, :null_amount, 0
+    change_column_default :poll_recounts, :total_amount, 0
+  end
+end

db/migrate/20171003095936_remove_officer_assigment_composed_index.rb

@@ -0,0 +1,5 @@
+class RemoveOfficerAssigmentComposedIndex < ActiveRecord::Migration
+  def change
+    remove_index "poll_officer_assignments", name: "index_poll_officer_assignments_on_officer_id_and_date"
+  end
+end