From 1bceed692253121d2c62d67d360adc59c4191578 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Sun, 4 Jan 2015 02:57:19 +0000 Subject: [PATCH] Merged r13831 from trunk to 2.6-stable. 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]: 
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.
git-svn-id: http://svn.redmine.org/redmine/branches/2.6-stable@13834 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/scm/adapters/cvs_adapter.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/redmine/scm/adapters/cvs_adapter.rb b/lib/redmine/scm/adapters/cvs_adapter.rb index d1096e725..fdfb4a66f 100644 --- a/lib/redmine/scm/adapters/cvs_adapter.rb +++ b/lib/redmine/scm/adapters/cvs_adapter.rb @@ -341,7 +341,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) -- 2.39.5