Ready to merge

db/migrate/20150807002150_add_info_to_registrations.rb

@@ -0,0 +1,7 @@
+class AddInfoToRegistrations < ActiveRecord::Migration
+  def change
+    add_column :conference_registrations, :allergies, :string
+    add_column :conference_registrations, :languages, :string
+    add_column :conference_registrations, :food, :string
+  end
+end

db/migrate/20150809011815_make_username_not_nullable.rb

@@ -0,0 +1,5 @@
+class MakeUsernameNotNullable < ActiveRecord::Migration
+  def change
+  	change_column :users, :username, :string, :null => false
+  end
+end

db/migrate/20150809012453_make_username_actually_not_nullable.rb

@@ -0,0 +1,5 @@
+class MakeUsernameActuallyNotNullable < ActiveRecord::Migration
+  def change
+  	change_column :users, :username, :string, :null => true
+  end
+end

db/migrate/20150811234700_create_delayed_jobs.rb

@@ -0,0 +1,22 @@
+class CreateDelayedJobs < ActiveRecord::Migration
+  def self.up
+    create_table :delayed_jobs, force: true do |table|
+      table.integer :priority, default: 0, null: false # Allows some jobs to jump to the front of the queue
+      table.integer :attempts, default: 0, null: false # Provides for retries, but still fail eventually.
+      table.text :handler,                 null: false # YAML-encoded string of the object that will do work
+      table.text :last_error                           # reason for last failure (See Note below)
+      table.datetime :run_at                           # When to run. Could be Time.zone.now for immediately, or sometime in the future.
+      table.datetime :locked_at                        # Set when a client is working on this object
+      table.datetime :failed_at                        # Set when all retries have failed (actually, by default, the record is deleted instead)
+      table.string :locked_by                          # Who is working on this object (if locked)
+      table.string :queue                              # The name of the queue this job is in
+      table.timestamps null: true
+    end
+
+    add_index :delayed_jobs, [:priority, :run_at], name: "delayed_jobs_priority"
+  end
+
+  def self.down
+    drop_table :delayed_jobs
+  end
+end

db/migrate/20150819042431_add_languages_to_workshops.rb

@@ -0,0 +1,9 @@
+class AddLanguagesToWorkshops < ActiveRecord::Migration
+  def change
+    add_column :workshops, :languages, :string
+    add_column :workshops, :needs, :string
+    add_column :workshops, :space, :string
+    add_column :workshops, :theme, :string
+    add_column :workshops, :host_info, :text
+  end
+end

db/migrate/20150821005002_add_notes_to_workshops.rb

@@ -0,0 +1,5 @@
+class AddNotesToWorkshops < ActiveRecord::Migration
+  def change
+    add_column :workshops, :notes, :text
+  end
+end