From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 12 Sep 2015 11:12:18 +0000 (+0000)
Subject: Merged r14550 (#20490).
X-Git-Tag: 3.1.1~17
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d3a2485467036c11019c3a19e695438e67741fcc;p=redmine.git

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 b36447cad..b6aafdc0e 100644
--- 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',