From cb05b44ee67bf08fcf3b5b17f07cd21d4e632556 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 25 Nov 2015 15:54:54 +1100 Subject: [PATCH] move template compiler into vendor for now in future we want to remove it and only include handlebars runtime --- app/assets/javascripts/ember_include.js.erb | 2 -- app/assets/javascripts/vendor.js | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/assets/javascripts/ember_include.js.erb b/app/assets/javascripts/ember_include.js.erb index 72857343a42..df7a68817ec 100644 --- a/app/assets/javascripts/ember_include.js.erb +++ b/app/assets/javascripts/ember_include.js.erb @@ -1,9 +1,7 @@ <% if Rails.env.development? || Rails.env.test? - require_asset ("ember-template-compiler.js") require_asset ("ember.debug.js") else - require_asset ("ember-template-compiler.js") require_asset ("ember.prod.js") end %> diff --git a/app/assets/javascripts/vendor.js b/app/assets/javascripts/vendor.js index 273d180340a..ae33b711b8d 100644 --- a/app/assets/javascripts/vendor.js +++ b/app/assets/javascripts/vendor.js @@ -2,6 +2,7 @@ //= require ./env //= require probes.js +//= require ember-template-compiler //= require handlebars.js //= require i18n-patches