From: Tom Hughes <tom@compton.nu>
Date: Mon, 5 Jun 2017 21:31:13 +0000 (+0100)
Subject: Replace deprecated ActiveModel::Errors get/set methods
X-Git-Tag: live~3390
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d85621c7aea365b1548d5301af292528dd8b329d

Replace deprecated ActiveModel::Errors get/set methods
---

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index 6b5079831..b6fc79b25 100644
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -725,8 +725,8 @@ class UserController < ApplicationController
             # Ignore errors sending email
           end
         else
-          @user.errors.set(:new_email, @user.errors.get(:email))
-          @user.errors.set(:email, [])
+          @user.errors.add(:new_email, @user.errors[:email])
+          @user.errors.add(:email, [])
         end
 
         user.restore_email!