summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2016-05-07 11:06:22 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2016-05-07 11:06:22 +0000
commitf2a5804f4e57e1b1c99f23d695d2b26e38b555e6 (patch)
tree4e73a2714adbe315dfd8e58ab31b3e46711ce0bb /app
parenteafd585dbe958443cb9d06d217b708cd9f48ea37 (diff)
downloadredmine-f2a5804f4e57e1b1c99f23d695d2b26e38b555e6.tar.gz
redmine-f2a5804f4e57e1b1c99f23d695d2b26e38b555e6.zip
Simplify User#today (#22320).
Patch by Jens Kraemer. git-svn-id: http://svn.redmine.org/redmine/trunk@15383 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/models/user.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/app/models/user.rb b/app/models/user.rb
index d97b38bc1..0fc740520 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -512,8 +512,7 @@ class User < Principal
if time_zone.nil?
Date.today
else
- # TODO replace with time_zone.today
- Time.now.in_time_zone(time_zone).to_date
+ time_zone.today
end
end