diff --git a/Gemfile b/Gemfile index e8b9a7f3b..a04bace71 100644 --- a/Gemfile +++ b/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' diff --git a/Gemfile.lock b/Gemfile.lock index 457f22c34..b7f39dcb7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js index 0b2472d21..075110661 100644 --- a/test/javascripts/test_helper.js +++ b/test/javascripts/test_helper.js @@ -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 };