Permalink
Browse files

Update to ember-rails 0.5.0

  • Loading branch information...
1 parent 42eb3cf commit 97a6c3daed23dfd3fee46a3eeb5056b978809a1f @r38y committed May 26, 2012
Showing with 12 additions and 22,342 deletions.
  1. +1 −1 Gemfile
  2. +9 −6 Gemfile.lock
  3. +2 −2 app/assets/javascripts/application.js
  4. +0 −3,562 app/assets/javascripts/vendor/ember-data.js
  5. +0 −18,771 app/assets/javascripts/vendor/ember.js
View
@@ -11,7 +11,7 @@ group :assets do
end
gem 'jquery-rails'
-gem 'ember-rails', '>= 0.4.0'
+gem 'ember-rails', '>= 0.5.0'
group :test do
# Pretty printed test output
View
@@ -14,6 +14,8 @@ GEM
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.1.2)
+ active_model_serializers (0.5.1)
+ activemodel (~> 3.0)
activemodel (3.2.3)
activesupport (= 3.2.3)
builder (~> 3.0.0)
@@ -31,25 +33,26 @@ GEM
ansi (1.4.2)
arel (3.0.2)
builder (3.0.0)
- ember-rails (0.4.0)
+ ember-rails (0.5.0)
+ active_model_serializers
execjs (>= 1.2)
railties (~> 3.1)
erubis (2.7.0)
- execjs (1.3.0)
+ execjs (1.4.0)
multi_json (~> 1.0)
hike (1.2.1)
i18n (0.6.0)
journey (1.0.3)
jquery-rails (2.0.2)
railties (>= 3.2.0, < 5.0)
thor (~> 0.14)
- json (1.6.6)
+ json (1.7.3)
mail (2.4.4)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.18)
- multi_json (1.3.2)
+ multi_json (1.3.5)
polyglot (0.3.3)
rack (1.4.1)
rack-cache (1.2)
@@ -81,7 +84,7 @@ GEM
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
- sprockets (2.1.2)
+ sprockets (2.1.3)
hike (~> 1.2)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
@@ -102,7 +105,7 @@ PLATFORMS
ruby
DEPENDENCIES
- ember-rails (>= 0.4.0)
+ ember-rails (>= 0.5.0)
jquery-rails
rails (= 3.2.3)
sass-rails
@@ -6,7 +6,7 @@
//
//= require jquery
//= require jquery_ujs
-//= require ./vendor/ember
-//= require ./vendor/ember-data
+//= require ember
+//= require ember-data
//= require_tree ./lib
//= require_tree ./app
Oops, something went wrong.

0 comments on commit 97a6c3d

Please sign in to comment.