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]:

<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/branches/2.6-stable@13834 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/lib/redmine/scm/adapters/cvs_adapter.rb b/lib/redmine/scm/adapters/cvs_adapter.rb
index d1096e7251c66eac87a7e9320876d10fd979d984..fdfb4a66ffddc0663b6664f64a3af6900e720af7 100644 (file)
--- 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)