continue ember-dev cycle fixes, and also bump ember-dev

emberjs · May 16, 2013 · dc24b82 · dc24b82
1 parent dfeb9e6
commit dc24b82
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/Assetfile b/Assetfile
@@ -1,5 +1,3 @@
-require 'ember-dev'
-
 distros = {
   :full    => %w(ember-data)
 }

diff --git a/Gemfile b/Gemfile
@@ -4,4 +4,3 @@ gem 'rake-pipeline', :git => 'https://github.com/livingsocial/rake-pipeline.git'
 gem 'ember-dev', :git => 'https://github.com/emberjs/ember-dev.git', :branch => 'master'
 
 gem 'ember-source', '1.0.0.rc3.3'
-
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,12 +1,11 @@
 GIT
   remote: https://github.com/emberjs/ember-dev.git
-  revision: b010d4809fac6e5bea6a99d800d825b804b5ba39
+  revision: 56b5ac50dfea95c704d79b1db2b42ed8fc4e5970
   branch: master
   specs:
     ember-dev (0.1)
       aws-sdk
       colored
-      ember-source
       execjs
       grit
       kicker
@@ -27,7 +26,7 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    aws-sdk (1.9.5)
+    aws-sdk (1.10.0)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
@@ -43,10 +42,10 @@ GEM
       mime-types (~> 1.15)
       posix-spawn (~> 0.3.6)
     handlebars-source (1.0.0.rc3)
-    json (1.7.7)
+    json (1.8.0)
     kicker (2.6.1)
       listen
-    listen (1.1.0)
+    listen (1.1.1)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)

diff --git a/config.ru b/config.ru
@@ -1,4 +1,5 @@
 require 'bundler/setup'
+require 'ember/source'
 require 'ember-dev'
 
 # This is not ideal