Merged r14550 (#20490).

git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14551 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/models/user.rb b/app/models/user.rb
index b36447cadd7ca744467a1287c3fd67578d081997..b6aafdc0e1bc1802662499fd9673edfb20b85f3a 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -656,8 +656,7 @@ class User < Principal
       (!admin? || User.active.where("admin = ? AND id <> ?", true, id).exists?)
   end
 
-  safe_attributes 'login',
-    'firstname',
+  safe_attributes 'firstname',
     'lastname',
     'mail',
     'mail_notification',