diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-09-12 11:12:18 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2015-09-12 11:12:18 +0000 |
| commit | d3a2485467036c11019c3a19e695438e67741fcc (patch) | |
| tree | 174a4584ffa78daaf8eed4969f42f3248f222c96 | |
| parent | 210384457140f9a72532753a5d6743a7564aadb4 (diff) | |
| download | redmine-d3a2485467036c11019c3a19e695438e67741fcc.tar.gz redmine-d3a2485467036c11019c3a19e695438e67741fcc.zip | |
Merged r14550 (#20490).
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14551 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/models/user.rb | 3 |
1 files changed, 1 insertions, 2 deletions
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', |