Temporarily roll back ember rc5. We identified some things we need to fix.

Gemfile

@@ -4,10 +4,8 @@ gem 'active_model_serializers', git: 'https://github.com/rails-api/active_model_
 
 # we had issues with latest, stick to the rev till we figure this out
 # PR that makes it all hang together welcome
-gem 'ember-rails'
+gem 'ember-rails', git: 'https://github.com/emberjs/ember-rails.git', ref: '57bbe32'
-gem 'ember-source', '1.0.0.rc5' # or the version you need
+gem 'barber', '0.3.0'
-gem 'handlebars-source', '1.0.0.rc4' # or the version you need
-gem 'barber'
 
 gem 'vestal_versions', git: 'https://github.com/zhangyuan/vestal_versions'
 

Gemfile.lock

@@ -53,6 +53,17 @@ GIT
       multi_json
       omniauth (~> 1.0)
 
+GIT
+  remote: https://github.com/emberjs/ember-rails.git
+  revision: 57bbe3202725e55a8e4eaccba83d663b26bcf024
+  ref: 57bbe32
+  specs:
+    ember-rails (0.10.1)
+      active_model_serializers
+      barber
+      execjs (>= 1.2)
+      railties (>= 3.1)
+
 GIT
   remote: https://github.com/rails-api/active_model_serializers.git
   revision: fe84e0ad5268f1439123fd9a1f9fd12e25a54cd3
@@ -131,10 +142,8 @@ GEM
       activesupport
       builder
     arel (3.0.2)
-    barber (0.4.2)
+    barber (0.3.0)
-      ember-source
       execjs
-      handlebars-source
     better_errors (0.8.0)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
@@ -165,13 +174,6 @@ GEM
     diffy (2.1.4)
     em-redis (0.3.0)
       eventmachine
-    ember-rails (0.10.0)
-      active_model_serializers
-      barber
-      execjs (>= 1.2)
-      railties (>= 3.1)
-    ember-source (1.0.0.rc5)
-      handlebars-source (= 1.0.0.rc4)
     erubis (2.7.0)
     eventmachine (1.0.3)
     excon (0.20.1)
@@ -222,7 +224,6 @@ GEM
       spork (>= 0.8.4)
     haml (4.0.2)
       tilt
-    handlebars-source (1.0.0.rc4)
     has_ip_address (0.0.1)
     hashie (2.0.4)
     highline (1.6.18)
@@ -482,7 +483,7 @@ DEPENDENCIES
   activerecord-postgres-hstore
   airbrake (= 3.1.2)
   annotate!
-  barber
+  barber (= 0.3.0)
   better_errors
   binding_of_caller
   certified
@@ -491,8 +492,7 @@ DEPENDENCIES
   discourse_emoji!
   discourse_plugin!
   em-redis
-  ember-rails
+  ember-rails!
-  ember-source (= 1.0.0.rc5)
   eventmachine
   fabrication
   fakeweb (~> 1.3.0)
@@ -505,7 +505,6 @@ DEPENDENCIES
   guard-jshint-on-rails
   guard-rspec
   guard-spork
-  handlebars-source (= 1.0.0.rc4)
   has_ip_address
   hiredis
   image_optim

app/assets/javascripts/application.js.erb

@@ -12,7 +12,7 @@
 // Externals we need to load first
 //= require ./external/jquery-1.8.3.js
 //= require ./external/jquery.ui.widget.js
-//= require ./external/handlebars-1.0.rc.4.js
+//= require ./external/handlebars-1.0.rc.3.js
 <%
 if Rails.env.development?
   require_asset ("./external_development/ember.js")

config/application.rb

@@ -112,7 +112,7 @@ module Discourse
     # ember stuff only used for asset precompliation, production variant plays up
     config.ember.variant = :development
     config.ember.ember_location = "#{Rails.root}/app/assets/javascripts/external_production/ember.js"
-    config.ember.handlebars_location = "#{Rails.root}/app/assets/javascripts/external/handlebars-1.0.rc.4.js"
+    config.ember.handlebars_location = "#{Rails.root}/app/assets/javascripts/external/handlebars-1.0.rc.3.js"
 
     # So open id logs somewhere sane
     config.after_initialize do

spec/javascripts/spec.js

@@ -9,7 +9,7 @@
 //= require ../../app/assets/javascripts/external/jquery-1.8.3.js
 
 //= require ../../app/assets/javascripts/external/jquery.ui.widget.js
-//= require ../../app/assets/javascripts/external/handlebars-1.0.rc.4.js
+//= require ../../app/assets/javascripts/external/handlebars-1.0.rc.3.js
 //= require ../../app/assets/javascripts/external_production/ember.js
 //= require ../../app/assets/javascripts/external_production/sugar-1.3.5.js
 //= require ../../app/assets/javascripts/external_production/group-helper.js