Commit 37a3e5b5

@@ -5,6 +5,7 @@ class ApplicationController < ActionController::Base
   before_filter :profile_application
   before_filter :load_categories
   before_filter :load_user
+  before_filter :configure_permitted_parameters, if: :devise_controller?
 
   private
 
@@ -18,7 +19,7 @@ class ApplicationController < ActionController::Base
 
   def load_categories
     #@categories = Rails.cache.fetch("categories-#{Category.count}") do
-      #Category.all
+    #Category.all
     #end
     @categories = Category.all
   end
@@ -26,4 +27,11 @@ class ApplicationController < ActionController::Base
   def load_user
     @user = current_user if current_user
   end
+
+  protected
+
+  def configure_permitted_parameters
+    devise_parameter_sanitizer.for(:user) { |u| u.permit(:name, :city, :email) }
+  end
 end
+

@@ -1,9 +1,9 @@
 class RegistrationsController < Devise::RegistrationsController
-  #force_ssl
   def edit
     @user = current_user
   end
 
+  # is this action used any more?
   def update
     @user = current_user
     @user.interest_ids = params[:user][:interest_ids] ||= []
@@ -18,4 +18,8 @@ class RegistrationsController < Devise::RegistrationsController
   def after_sign_in_path_for(resource)
     settings_path
   end
+
+  def sign_up_params
+    params.require(:user).permit(:name, :city, :email, :password, :password_confirmation)
+  end
 end