Merge branch 'master' into features/publicity

# Conflicts: # .gitignore
2017-04-18 16:22:36 +02:00
parent 93dc7b0c50 cb1bf34588
commit 8cb8aea9ca
13 changed files with 11 additions and 81 deletions
@@ -36,6 +36,6 @@ class ApplicationController < ActionController::Base
  protected

  def configure_permitted_parameters
-    devise_parameter_sanitizer.permit(:account_update, keys: [:first_name, :last_name, :street, :city, :zip, :support, :language, :age_category, :unsubscribed])
+    devise_parameter_sanitizer.permit(:account_update, keys: [:first_name, :last_name, :street, :city, :zip, :support, :language, :age_category])
  end
 end