Merge branch 'master' into admin-77

2015-08-08 13:00:41 +02:00
parent a949d54a85 90a3dcdc16
commit f8becd1b23
38 changed files with 628 additions and 92 deletions
--- a/db/migrate/20150806163142_add_preferences_to_users.rb
+++ b/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