Updating Gemfile

Gemfile

@@ -1,11 +1,12 @@
 source 'https://rubygems.org'
 
-gem 'rails', :git => "/Users/steve/src/rails"
-gem 'active_record_deprecated_finders', github: 'rails/active_record_deprecated_finders'
+gem 'rails', :github => "steveklabnik/rails", :branch => "backport_queue"
 gem 'rails-api'
 
-gem 'active_model_serializers', :github => 'steveklabnik/active_model_serializers'
+gem "active_model_serializers", :github => "josevalim/active_model_serializers"
 
 gem 'sqlite3'
 
 gem 'jquery-rails'
+
+gem 'ember-rails'

Gemfile.lock

@@ -1,65 +1,69 @@
 GIT
-  remote: /Users/steve/src/rails
-  revision: 6a06ce96d7e2fb2a02c91a4a4c9e22cf25295f3d
+  remote: git://github.com/josevalim/active_model_serializers.git
+  revision: 43f32c868a6bbe2c1061c8c58e0fdd9da43a29e3
   specs:
-    actionmailer (4.0.0.beta)
-      actionpack (= 4.0.0.beta)
+    active_model_serializers (0.5.0)
+      activemodel (~> 3.0)
+
+GIT
+  remote: git://github.com/steveklabnik/rails.git
+  revision: 07958c136389c01e8014852f8de40cc3a20f71c0
+  branch: backport_queue
+  specs:
+    actionmailer (3.2.3)
+      actionpack (= 3.2.3)
       mail (~> 2.4.4)
-    actionpack (4.0.0.beta)
-      activemodel (= 4.0.0.beta)
-      activesupport (= 4.0.0.beta)
+    actionpack (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.1)
-      rack (~> 1.4.1)
+      rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-    activemodel (4.0.0.beta)
-      activesupport (= 4.0.0.beta)
+      sprockets (~> 2.1.3)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
-    activerecord (4.0.0.beta)
-      active_record_deprecated_finders (= 0.0.1)
-      activemodel (= 4.0.0.beta)
-      activesupport (= 4.0.0.beta)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
       arel (~> 3.0.2)
-    activesupport (4.0.0.beta)
+      tzinfo (~> 0.3.29)
+    activeresource (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+    activesupport (3.2.3)
       i18n (~> 0.6)
-      multi_json (~> 1.3)
-      tzinfo (~> 0.3.31)
-    rails (4.0.0.beta)
-      actionmailer (= 4.0.0.beta)
-      actionpack (= 4.0.0.beta)
-      activerecord (= 4.0.0.beta)
-      activesupport (= 4.0.0.beta)
-      bundler (~> 1.1)
-      railties (= 4.0.0.beta)
-      sprockets-rails (~> 1.0)
-    railties (4.0.0.beta)
-      actionpack (= 4.0.0.beta)
-      activesupport (= 4.0.0.beta)
+      multi_json (~> 1.0)
+    rails (3.2.3)
+      actionmailer (= 3.2.3)
+      actionpack (= 3.2.3)
+      activerecord (= 3.2.3)
+      activeresource (= 3.2.3)
+      activesupport (= 3.2.3)
+      bundler (~> 1.0)
+      railties (= 3.2.3)
+    railties (3.2.3)
+      actionpack (= 3.2.3)
+      activesupport (= 3.2.3)
+      rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
 
-GIT
-  remote: git://github.com/rails/active_record_deprecated_finders.git
-  revision: 34280b63d5bb00cbc6ed9eda373b4dba03c28a1c
-  specs:
-    active_record_deprecated_finders (0.0.1)
-
-GIT
-  remote: git://github.com/steveklabnik/active_model_serializers.git
-  revision: b7e23332532c36fdd2801b28ccd65adf78f1e8b1
-  specs:
-    active_model_serializers (0.1.0)
-      activemodel (= 4.0.0.beta)
-
 GEM
   remote: https://rubygems.org/
   specs:
     arel (3.0.2)
     builder (3.0.0)
+    ember-rails (0.2.4)
+      execjs (>= 1.2)
+      railties (>= 3.0)
     erubis (2.7.0)
+    execjs (1.3.2)
+      multi_json (~> 1.0)
     hike (1.2.1)
     i18n (0.6.0)
     journey (1.0.3)
@@ -77,6 +81,8 @@ GEM
     rack (1.4.1)
     rack-cache (1.2)
       rack (>= 0.4)
+    rack-ssl (1.3.2)
+      rack
     rack-test (0.6.1)
       rack (>= 1.0)
     rails-api (0.0.1)
@@ -86,14 +92,10 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    sprockets (2.3.2)
+    sprockets (2.1.3)
       hike (~> 1.2)
-      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (1.0.0)
-      railties (>= 4.0.0.beta, < 5.0)
-      sprockets (~> 2.3.1)
     sqlite3 (1.3.6)
     thor (0.15.2)
     tilt (1.3.3)
@@ -107,7 +109,7 @@ PLATFORMS
 
 DEPENDENCIES
   active_model_serializers!
-  active_record_deprecated_finders!
+  ember-rails
   jquery-rails
   rails!
   rails-api