summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2015-01-03 17:31:01 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2015-01-03 17:31:01 +0000
commita9298224b15be4784e171775f932d938bd1c7d21 (patch)
tree9ae6e1749b90acb69a946e28e880667acc8cbb00 /lib
parent9da6bb31c11bb72ec0a4605d5fa6458159110f65 (diff)
downloadredmine-a9298224b15be4784e171775f932d938bd1c7d21.tar.gz
redmine-a9298224b15be4784e171775f932d938bd1c7d21.zip
fix Ruby 2.2 warning at lib/redmine/scm/adapters/cvs_adapter.rb
On ruby 2.2.0p0 (2014-12-25 revision 49005) [x86_64-linux]: <pre> lib/redmine/scm/adapters/cvs_adapter.rb:342: warning: Comparable#== will no more rescue exceptions of #<=> in the next release. lib/redmine/scm/adapters/cvs_adapter.rb:342: warning: Return nil in #<=> if the comparison is inappropriate or avoid such comparison. </pre> git-svn-id: http://svn.redmine.org/redmine/trunk@13831 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
-rw-r--r--lib/redmine/scm/adapters/cvs_adapter.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/redmine/scm/adapters/cvs_adapter.rb b/lib/redmine/scm/adapters/cvs_adapter.rb
index ec7ce7bcf..92be4389e 100644
--- a/lib/redmine/scm/adapters/cvs_adapter.rb
+++ b/lib/redmine/scm/adapters/cvs_adapter.rb
@@ -339,7 +339,7 @@ module Redmine
# convert a date/time into the CVS-format
def time_to_cvstime(time)
return nil if time.nil?
- time = Time.now if time == 'HEAD'
+ time = Time.now if (time.kind_of?(String) && time == 'HEAD')
unless time.kind_of? Time
time = Time.parse(time)