gistfile1.txt

$ g df HEAD
diff --git a/Gemfile b/Gemfile
index 59c78aa..8d1e5cc 100644
--- a/Gemfile
+++ b/Gemfile
@@ -3,7 +3,7 @@ source 'http://rubygems.org'
  gem 'rails'
  gem 'will_paginate'
  gem 'aws-s3'
-# gem 'dm-active_model', :git => 'https://github.com/datamapper/dm-active_model.git', :branch => 'master' 
+ gem 'dm-active_model', :git => 'https://github.com/datamapper/dm-active_model.git', :branch => 'master' 
  gem 'dm-aggregates'      
  gem 'dm-constraints'     
  gem 'dm-devise'
diff --git a/Gemfile.lock b/Gemfile.lock
index 77a3327..052a4fc 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -9,7 +9,7 @@ GIT
 
 GIT
   remote: http://github.com/andrewkolesnikov/dm-rails.git
-  revision: 33429b9ebddd4dbecd902334a190c8542f397dc3
+  revision: 595a4598f31d15dea28d81cb43fa9f20b0ba3fb0
   branch: master
   specs:
     dm-rails (1.1.1)
@@ -18,6 +18,15 @@ GIT
       dm-core (~> 1.1.0)
       railties (~> 3.0.4)
 
+GIT
+  remote: https://github.com/datamapper/dm-active_model.git
+  revision: 5758780a5fbb3e6c0e8a358c84bfb6e12aa02e01
+  branch: master
+  specs:
+    dm-active_model (1.1.1)
+      activemodel (~> 3.0.4)
+      dm-core (~> 1.1.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -82,9 +91,6 @@ GEM
       orm_adapter (~> 0.0.3)
       warden (~> 1.0.3)
     diff-lcs (1.1.2)
-    dm-active_model (1.1.0)
-      activemodel (~> 3.0.4)
-      dm-core (~> 1.1.0)
     dm-aggregates (1.1.0)
       dm-core (~> 1.1.0)
     dm-constraints (1.1.0)
@@ -93,11 +99,11 @@ GEM
       addressable (~> 2.2.4)
     dm-devise (1.4.0)
       devise (~> 1.3)
-      dm-core (>= 1.0.2, < 1.2)
-      dm-migrations (>= 1.0.2, < 1.2)
-      dm-rails (>= 1.0.3, < 1.2)
-      dm-serializer (>= 1.0.2, < 1.2)
-      dm-timestamps (>= 1.0.2, < 1.2)
+      dm-core (< 1.2, >= 1.0.2)
+      dm-migrations (< 1.2, >= 1.0.2)
+      dm-rails (< 1.2, >= 1.0.3)
+      dm-serializer (< 1.2, >= 1.0.2)
+      dm-timestamps (< 1.2, >= 1.0.2)
       sugar-high (~> 0.2.10)
     dm-do-adapter (1.1.0)
       data_objects (~> 0.10.2)
@@ -205,7 +211,7 @@ GEM
       sexp_processor (~> 3.0)
     rubyzip (0.9.4)
     sanitize (2.0.3)
-      nokogiri (>= 1.4.4, < 1.6)
+      nokogiri (< 1.6, >= 1.4.4)
     selenium-webdriver (0.2.2)
       childprocess (>= 0.1.9)
       ffi (>= 1.0.7)
@@ -238,6 +244,7 @@ DEPENDENCIES
   activerecord
   aws-s3
   capybara
+  dm-active_model!
   dm-aggregates
   dm-constraints
   dm-devise