ryanb/cancan — pull request #631 by andhapp (2012-05-26 16:47:39+00:00)
Title: Handle MetaWhere and non-MetaWhere conditions correctly

Just a bit of the background of the issue.

When there are multiple rules, CanCan does the sensible thing by merging them together. However, if one of the conditions is of type MetaWhere::Column, it fails. MetaWhere is intelligent enough to work with multiple conditions defined in any format whatsoever. So, this fix simply ensures that with multiple rules, where one of them is of type MetaWhere, CanCan doesn't merge them and just pass it on to MetaWhere.