From f73aa444ee1f2d80b6e5e0468cca39a866f46da9 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Mon, 17 Nov 2014 20:26:07 -0500
Subject: [PATCH] FIX: GroupedView bug with latest Ember build

---
 vendor/assets/javascripts/development/ember.js | 1 +
 vendor/assets/javascripts/production/ember.js  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/vendor/assets/javascripts/development/ember.js b/vendor/assets/javascripts/development/ember.js
index 894673543e4..4e25fe0987e 100644
--- a/vendor/assets/javascripts/development/ember.js
+++ b/vendor/assets/javascripts/development/ember.js
@@ -9367,6 +9367,7 @@ define("ember-handlebars/helpers/view",
         } else if (isGlobalPath(path)) {
           return null;
         } else if (path === 'this' || path === '') {
+          if (data.insideGroup && data.insideEach) { return 'context'; }
           return '_parentView.context';
         } else {
           return '_parentView.context.' + path;
diff --git a/vendor/assets/javascripts/production/ember.js b/vendor/assets/javascripts/production/ember.js
index a632b068517..8a0ea9c7cc0 100644
--- a/vendor/assets/javascripts/production/ember.js
+++ b/vendor/assets/javascripts/production/ember.js
@@ -9074,6 +9074,7 @@ define("ember-handlebars/helpers/view",
         } else if (isGlobalPath(path)) {
           return null;
         } else if (path === 'this' || path === '') {
+          if (data.insideGroup && data.insideEach) { return 'context'; }
           return '_parentView.context';
         } else {
           return '_parentView.context.' + path;