Merge branch 'master' into admin-77

db/migrate/20150806163142_add_preferences_to_users.rb

@@ -0,0 +1,6 @@
+class AddPreferencesToUsers < ActiveRecord::Migration
+  def change
+    add_column :users, :email_on_debate_comment, :boolean, default: false
+    add_column :users, :email_on_comment_reply, :boolean, default: false
+  end
+end

db/schema.rb

@@ -94,6 +94,8 @@ ActiveRecord::Schema.define(version: 20150807140346) do
     t.string   "unconfirmed_email"
     t.string   "nickname"
     t.boolean  "use_nickname",           default: false, null: false
+    t.boolean  "email_on_debate_comment", default: false
+    t.boolean  "email_on_comment_reply",  default: false
   end
 
   add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true, using: :btree