Fix for pull request #657.

ryanb · Jul 12, 2012 · ff670ed · ff670ed
1 parent 2b660d7
commit ff670ed
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/Gemfile b/Gemfile
@@ -6,10 +6,6 @@ when nil, "active_record"
   gem "activerecord", '~> 3.0.9', :require => "active_record"
   gem "with_model", "~> 0.2.5"
   gem "meta_where"
-when "active_record_31"
-  gem "sqlite3"
-  gem "activerecord", '~> 3.1.6', :require => "active_record"
-  gem "with_model", "~> 0.2.5"
 when "data_mapper"
   gem "dm-core", "~> 1.0.2"
   gem "dm-sqlite-adapter", "~> 1.0.2"

diff --git a/lib/cancan/controller_resource.rb b/lib/cancan/controller_resource.rb
@@ -88,7 +88,7 @@ def build_resource
       else
         resource = resource_base.new(resource_params || {})
       end
-      #assign_attributes(resource)
+      assign_attributes(resource)
     end
 
     def assign_attributes(resource)