summaryrefslogtreecommitdiffstats
path: root/lib/redmine/scm/adapters/cvs_adapter.rb
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-04-15 04:23:42 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-04-15 04:23:42 +0000
commit50fe1ecc1815f5734b1766d81cbe3fecb055bc5d (patch)
tree933b1133b105b0fa6385ba1bf599cbce794300b0 /lib/redmine/scm/adapters/cvs_adapter.rb
parent80e2eed70291d4ec81bc2e21e47a717bfaba1b1d (diff)
downloadredmine-50fe1ecc1815f5734b1766d81cbe3fecb055bc5d.tar.gz
redmine-50fe1ecc1815f5734b1766d81cbe3fecb055bc5d.zip
scm: cvs: strict string type and timezone in cvstime.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5460 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/redmine/scm/adapters/cvs_adapter.rb')
-rw-r--r--lib/redmine/scm/adapters/cvs_adapter.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/redmine/scm/adapters/cvs_adapter.rb b/lib/redmine/scm/adapters/cvs_adapter.rb
index 06ab1555f..94e868fbc 100644
--- a/lib/redmine/scm/adapters/cvs_adapter.rb
+++ b/lib/redmine/scm/adapters/cvs_adapter.rb
@@ -335,12 +335,12 @@ module Redmine
# convert a date/time into the CVS-format
def time_to_cvstime(time)
return nil if time.nil?
- return Time.now if time == 'HEAD'
+ time = Time.now if time == 'HEAD'
unless time.kind_of? Time
time = Time.parse(time)
end
- return time.strftime("%Y-%m-%d %H:%M:%S")
+ return time_to_cvstime_rlog(time)
end
def time_to_cvstime_rlog(time)