From: Tom Hughes <tom@compton.nu>
Date: Sat, 10 Jan 2015 12:37:52 +0000 (+0000)
Subject: Replace deprecated reset method with restore method
X-Git-Tag: live~4284^2~4
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/046fbdc1777e0e9dfd400eb56d560f46bc69ddec?ds=sidebyside

Replace deprecated reset method with restore method
---

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index a0514c8e9..a7bf53824 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -742,7 +742,7 @@ private
           @user.errors.set(:email, [])
         end
 
-        user.reset_email!
+        user.restore_email!
       end
     end
   end