Merge branch 'following-users'

APwhitehat · Mar 3, 2017 · 521772b · 521772b
2 parents 87968bf + 0eee37b
commit 521772b
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app/controllers/password_resets_controller.rb b/app/controllers/password_resets_controller.rb
@@ -24,7 +24,7 @@ def edit
 
   def update
     if params[:user][:password].empty?                  # Case (3)
-      @user.errors.add(:password, "can't be empty")
+      @user.errors.add(:password, :blank)
       render 'edit'
     elsif @user.update_attributes(user_params)          # Case (4)
       log_in @user