Fixes conflicts

2015-08-08 13:28:29 +02:00
parent fdfef95595 90a3dcdc16
commit c048f25941
38 changed files with 562 additions and 83 deletions
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -20,7 +20,7 @@ class AccountController < ApplicationController
    end

    def account_params
-      params.require(:account).permit(:first_name, :last_name, :nickname, :use_nickname)
+      params.require(:account).permit(:first_name, :last_name, :nickname, :use_nickname, :email_on_debate_comment, :email_on_comment_reply)
    end

 end