run the tests with emberjs 1.0

emberjs-addons · Sep 2, 2013 · bc65c5d · bc65c5d · Emerson · Sep 3, 2013
1 parent 0f2b062
commit bc65c5d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/Gemfile b/Gemfile
@@ -4,7 +4,7 @@ gem 'rake'
 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.rc6.2'
+gem 'ember-source', '1.0.0'
 
 # Documentation Website
 gem 'nanoc', '~> 3.5.0'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/emberjs/ember-dev.git
-  revision: 6ed6c8ed4c1d77f053b0e751c9e0259d65465e14
+  revision: 534ffdfc4b3468edb3951e9e2012cead25b36997
   branch: master
   specs:
     ember-dev (0.1)
@@ -34,19 +34,18 @@ GEM
   specs:
     adsf (1.1.1)
       rack (>= 1.0.0)
-    aws-sdk (1.14.1)
+    aws-sdk (1.11.1)
       json (~> 1.4)
-      nokogiri (< 1.6.0)
+      nokogiri (>= 1.4.4)
       uuidtools (~> 2.1)
-    coderay (1.0.9)
+    coderay (1.1.0)
     colored (1.2)
-    cri (2.3.0)
+    cri (2.4.0)
       colored (>= 1.2)
     diff-lcs (1.2.4)
-    ember-source (1.0.0.rc6.2)
+    ember-source (1.0.0)
       handlebars-source (= 1.0.12)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
+    execjs (2.0.1)
     ffi (1.9.0)
     fssm (0.2.10)
     grit (2.5.0)
@@ -58,28 +57,30 @@ GEM
     kicker (2.6.1)
       listen
     kramdown (0.14.2)
-    listen (1.2.2)
+    listen (1.3.0)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
-    mime-types (1.23)
-    multi_json (1.7.7)
+    mime-types (1.25)
+    mini_portile (0.5.1)
+    multi_json (1.7.9)
     nanoc (3.5.0)
       cri (~> 2.2)
-    nokogiri (1.5.10)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
     posix-spawn (0.3.6)
     rack (1.5.2)
     rake (10.0.4)
     rake-pipeline-web-filters (0.7.0)
       rack
       rake-pipeline (~> 0.6)
     rb-fsevent (0.9.3)
-    rb-inotify (0.9.0)
+    rb-inotify (0.9.1)
       ffi (>= 0.5.0)
     rb-kqueue (0.2.0)
       ffi (>= 0.5.0)
     thor (0.18.1)
-    uglifier (2.1.2)
+    uglifier (2.2.1)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
     uuidtools (2.1.4)
@@ -95,7 +96,7 @@ DEPENDENCIES
   coderay
   ember-bootstrap-source!
   ember-dev!
-  ember-source (= 1.0.0.rc6.2)
+  ember-source (= 1.0.0)
   fssm
   kramdown (~> 0.14.2)
   mime-types