codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-23 15:48:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: Compile templates with the correct ember

Browse source
This commit is contained in:
Robin Ward 2013-07-16 11:46:31 -04:00
parent d466d11e71
commit 1927263d1d
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -5,7 +5,7 @@ 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 # we had issues with latest, stick to the rev till we figure this out
# PR that makes it all hang together welcome # PR that makes it all hang together welcome
gem 'ember-rails' gem 'ember-rails'
gem 'ember-source', '1.0.0.rc6' gem 'ember-source', '1.0.0.rc6.2'
gem 'handlebars-source' gem 'handlebars-source'
gem 'barber' gem 'barber'

8
Gemfile.lock
View file

@ -169,8 +169,8 @@ GEM
barber barber
execjs (>= 1.2) execjs (>= 1.2)
railties (>= 3.1) railties (>= 3.1)
ember-source (1.0.0.rc6) ember-source (1.0.0.rc6.2)
handlebars-source (= 1.0.0.rc4) handlebars-source (= 1.0.12)
erubis (2.7.0) erubis (2.7.0)
eventmachine (1.0.3) eventmachine (1.0.3)
excon (0.20.1) excon (0.20.1)
@ -211,7 +211,7 @@ GEM
childprocess (>= 0.2.3) childprocess (>= 0.2.3)
guard (>= 1.1) guard (>= 1.1)
spork (>= 0.8.4) spork (>= 0.8.4)
handlebars-source (1.0.0.rc4) handlebars-source (1.0.12)
hashie (2.0.4) hashie (2.0.4)
highline (1.6.18) highline (1.6.18)
hike (1.2.2) hike (1.2.2)
@ -482,7 +482,7 @@ DEPENDENCIES
em-redis em-redis
email_reply_parser! email_reply_parser!
ember-rails ember-rails
ember-source (= 1.0.0.rc6) ember-source (= 1.0.0.rc6.2)
eventmachine eventmachine
fabrication fabrication
fakeweb (~> 1.3.0) fakeweb (~> 1.3.0)

10
test/javascripts/test_helper.js
View file

@ -46,11 +46,11 @@
// sinon settings // sinon settings
sinon.config = { sinon.config = {
injectIntoThis: true, injectIntoThis: true,
injectInto: null, injectInto: null,
properties: ["spy", "stub", "mock", "clock", "sandbox"], properties: ["spy", "stub", "mock", "clock", "sandbox"],
useFakeTimers: false, useFakeTimers: false,
useFakeServer: false useFakeServer: false
}; };
window.assetPath = function() { return null }; window.assetPath = function() { return null };