mirror of
https://github.com/codeninjasllc/discourse.git
synced 2024-11-27 09:36:19 -05:00
FIX: Compile templates with the correct ember
This commit is contained in:
parent
d466d11e71
commit
1927263d1d
3 changed files with 10 additions and 10 deletions
2
Gemfile
2
Gemfile
|
@ -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
|
||||
# PR that makes it all hang together welcome
|
||||
gem 'ember-rails'
|
||||
gem 'ember-source', '1.0.0.rc6'
|
||||
gem 'ember-source', '1.0.0.rc6.2'
|
||||
gem 'handlebars-source'
|
||||
gem 'barber'
|
||||
|
||||
|
|
|
@ -169,8 +169,8 @@ GEM
|
|||
barber
|
||||
execjs (>= 1.2)
|
||||
railties (>= 3.1)
|
||||
ember-source (1.0.0.rc6)
|
||||
handlebars-source (= 1.0.0.rc4)
|
||||
ember-source (1.0.0.rc6.2)
|
||||
handlebars-source (= 1.0.12)
|
||||
erubis (2.7.0)
|
||||
eventmachine (1.0.3)
|
||||
excon (0.20.1)
|
||||
|
@ -211,7 +211,7 @@ GEM
|
|||
childprocess (>= 0.2.3)
|
||||
guard (>= 1.1)
|
||||
spork (>= 0.8.4)
|
||||
handlebars-source (1.0.0.rc4)
|
||||
handlebars-source (1.0.12)
|
||||
hashie (2.0.4)
|
||||
highline (1.6.18)
|
||||
hike (1.2.2)
|
||||
|
@ -482,7 +482,7 @@ DEPENDENCIES
|
|||
em-redis
|
||||
email_reply_parser!
|
||||
ember-rails
|
||||
ember-source (= 1.0.0.rc6)
|
||||
ember-source (= 1.0.0.rc6.2)
|
||||
eventmachine
|
||||
fabrication
|
||||
fakeweb (~> 1.3.0)
|
||||
|
|
|
@ -46,11 +46,11 @@
|
|||
|
||||
// sinon settings
|
||||
sinon.config = {
|
||||
injectIntoThis: true,
|
||||
injectInto: null,
|
||||
properties: ["spy", "stub", "mock", "clock", "sandbox"],
|
||||
useFakeTimers: false,
|
||||
useFakeServer: false
|
||||
injectIntoThis: true,
|
||||
injectInto: null,
|
||||
properties: ["spy", "stub", "mock", "clock", "sandbox"],
|
||||
useFakeTimers: false,
|
||||
useFakeServer: false
|
||||
};
|
||||
|
||||
window.assetPath = function() { return null };
|
||||
|
|
Loading…
Reference in a new issue