Merge remote-tracking branch 'upstream/pull/4732'

[rails.git] / app / controllers / passwords_controller.rb

diff --git a/app/controllers/passwords_controller.rb b/app/controllers/passwords_controller.rb
index a70883edace23c3899d4da7322f6af8290874260..26b21b6d9180e0f1737ab7b9afe5a03b01f40153 100644 (file)
--- a/app/controllers/passwords_controller.rb
+++ b/app/controllers/passwords_controller.rb
@@ -42,12 +42,10 @@ class PasswordsController < ApplicationController
     if user
       token = user.generate_token_for(:password_reset)
       UserMailer.lost_password(user, token).deliver_later
     if user
       token = user.generate_token_for(:password_reset)
       UserMailer.lost_password(user, token).deliver_later

-      flash[:notice] = t ".notice email on way"
-      redirect_to login_path
-    else
-      flash.now[:error] = t ".notice email cannot find"
-      render :new

     end
     end

+
+    flash[:notice] = t ".send_paranoid_instructions"
+    redirect_to login_path

   end
 
   def update
   end
 
   def update