Merge pull request rails#5124 from bquorning/prefer-||-over-'or'-for-boolean-operations

Prefer || over 'or' for boolean operations

Author: josevalim

activemodel/lib/active_model/validations/length.rb

@@ -27,7 +27,7 @@ def check_validity!
         keys.each do |key|
           value = options[key]
 
-          unless value.is_a?(Integer) && value >= 0 or value == Float::INFINITY
+          unless (value.is_a?(Integer) && value >= 0) || value == Float::INFINITY
             raise ArgumentError, ":#{key} must be a nonnegative Integer or Infinity"
           end
         end