lib/mongoid/contextual/mongo.rb in mongoid-3.1.1 vs lib/mongoid/contextual/mongo.rb in mongoid-3.1.2

@@ -464,9 +464,12 @@
       def apply_options
         apply_fields
         [ :hint, :limit, :skip, :sort, :batch_size, :max_scan ].each do |name|
           apply_option(name)
         end
+        if criteria.options[:timeout] == false
+          query.no_timeout
+        end
       end
 
       # Apply an option.
       #
       # @api private