aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorwycats <wycats@gmail.com>2010-03-28 11:06:46 -0700
committerwycats <wycats@gmail.com>2010-03-28 11:06:46 -0700
commitc99194c7bed6744104e114ab231ef39158044a63 (patch)
tree9566ad06335bf96d4c32e421c2d25b4676b3e0d3 /railties
parent835f5d0269a8d3615585119e77f1ba7d601c943b (diff)
parentf1e5a9ff982998c31c9dedf2fa79180c7dea820a (diff)
downloadrails-c99194c7bed6744104e114ab231ef39158044a63.tar.gz
rails-c99194c7bed6744104e114ab231ef39158044a63.tar.bz2
rails-c99194c7bed6744104e114ab231ef39158044a63.zip
Merge remote branch 'rizwan/restrict'
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/rails/resource/resource_generator.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/railties/lib/rails/generators/rails/resource/resource_generator.rb b/railties/lib/rails/generators/rails/resource/resource_generator.rb
index 1e78945a7e..8a46708009 100644
--- a/railties/lib/rails/generators/rails/resource/resource_generator.rb
+++ b/railties/lib/rails/generators/rails/resource/resource_generator.rb
@@ -1,5 +1,6 @@
require 'rails/generators/resource_helpers'
require 'rails/generators/rails/model/model_generator'
+require 'active_support/core_ext/object/blank'
module Rails
module Generators