aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-06-25 10:39:48 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-06-25 10:39:48 -0700
commit7eaf90a7ab6b02d5946857fdee7271a0a3b640d2 (patch)
tree483de52a1cd68215943a1f790cb6995707386b77 /railties
parent0c850f8dab8c23abc3f8675fd2b82af20101c3c4 (diff)
parente17ddc255d5d3d2d1032e0f42c627023769ad5ee (diff)
downloadrails-7eaf90a7ab6b02d5946857fdee7271a0a3b640d2.tar.gz
rails-7eaf90a7ab6b02d5946857fdee7271a0a3b640d2.tar.bz2
rails-7eaf90a7ab6b02d5946857fdee7271a0a3b640d2.zip
Merge pull request #11093 from nolman/restoring-scaffold-generation
restore correct scaffold generation
Diffstat (limited to 'railties')
-rw-r--r--railties/lib/rails/generators/active_model.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/generators/active_model.rb b/railties/lib/rails/generators/active_model.rb
index 9f8a7aa416..e5373704d7 100644
--- a/railties/lib/rails/generators/active_model.rb
+++ b/railties/lib/rails/generators/active_model.rb
@@ -34,7 +34,7 @@ module Rails
# GET index
def self.all(klass)
- "#{klass}.scoped.to_a"
+ "#{klass}.all"
end
# GET show