emberjs/ember.js — pull request #9467 by wecc (2014-11-01 22:00:40+00:00)
Title: [BUGFIX] Added asserts for reserved route/resource names

Added asserts for routes/resources named 'array' or 'object' (in addition to 'basic'). Quick fix for #5425.