Avoid duplicate clauses when using #or
#29950

MaxLap wants to merge MaxLap:avoid_or_clause_duplicates into rails:master

We do not currently have an analysis of these two commits