Import Action Text
#34873

georgeclaghorn wants to merge georgeclaghorn:actiontext into rails:master

We do not currently have an analysis of these two commits